From: Peter Krempa Date: Wed, 14 Apr 2021 14:43:22 +0000 (+0200) Subject: qemu: driver: Use virDomainDiskDefParseSource in qemuDomainBlockCopy X-Git-Tag: v7.3.0-rc1~167 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0202467c4ba8663db2304b140af609f93a9b3091;p=thirdparty%2Flibvirt.git qemu: driver: Use virDomainDiskDefParseSource in qemuDomainBlockCopy qemuDomainBlockCopy needs just the source portion of the disk but uses the disk parser for it. Since we have a specific function now, refactor the code to avoid having to deal with the unused virDomainDiskDef. Signed-off-by: Peter Krempa Reviewed-by: Michal Privoznik --- diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 88ee9e5d5e..d908e95ba7 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15273,7 +15273,6 @@ qemuDomainBlockCopy(virDomainPtr dom, const char *disk, const char *destxml, unsigned long long bandwidth = 0; unsigned int granularity = 0; unsigned long long buf_size = 0; - virDomainDiskDef *diskdef = NULL; virStorageSource *dest = NULL; size_t i; @@ -15326,18 +15325,14 @@ qemuDomainBlockCopy(virDomainPtr dom, const char *disk, const char *destxml, } } - if (!(diskdef = virDomainDiskDefParse(destxml, driver->xmlopt, - VIR_DOMAIN_DEF_PARSE_INACTIVE | - VIR_DOMAIN_DEF_PARSE_DISK_SOURCE))) + if (!(dest = virDomainDiskDefParseSource(destxml, driver->xmlopt, + VIR_DOMAIN_DEF_PARSE_INACTIVE))) goto cleanup; - dest = g_steal_pointer(&diskdef->src); - ret = qemuDomainBlockCopyCommon(vm, dom->conn, disk, dest, bandwidth, granularity, buf_size, flags, false); cleanup: - virDomainDiskDefFree(diskdef); virDomainObjEndAPI(&vm); return ret; }