From 172ca0e748714799bc0abec1144d7896e681728b Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Thu, 18 Sep 2014 11:21:10 +0200 Subject: [PATCH] qemu: Sanitize argument names and empty disk check in qemuDomainDetermineDiskChain Reuse virStorageSourceIsEmpty and rename "force" argument to "force_probe". --- src/qemu/qemu_domain.c | 8 +++----- src/qemu/qemu_domain.h | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index f4b5b8cdfc..a969d278a0 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2707,20 +2707,18 @@ int qemuDomainDetermineDiskChain(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainDiskDefPtr disk, - bool force) + bool force_probe) { virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); int ret = 0; uid_t uid; gid_t gid; - int type = virStorageSourceGetActualType(disk->src); - if (type != VIR_STORAGE_TYPE_NETWORK && - !disk->src->path) + if (virStorageSourceIsEmpty(disk->src)) goto cleanup; if (disk->src->backingStore) { - if (force) + if (force_probe) virStorageSourceBackingStoreClear(disk->src); else goto cleanup; diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index d21acd7510..c1d1edf9f1 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -370,7 +370,7 @@ int qemuDomainCheckDiskPresence(virQEMUDriverPtr driver, int qemuDomainDetermineDiskChain(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainDiskDefPtr disk, - bool force); + bool force_probe); int qemuDomainStorageFileInit(virQEMUDriverPtr driver, virDomainObjPtr vm, -- 2.47.2