From cd3aa2058dfa043ee47fa6a4ef7296bc5e1be12b Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Wed, 20 Jul 2022 12:23:38 +0200 Subject: [PATCH] qemu: driver: Remove pre-blockdev code paths from qemuDomainBlockPullCommon MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Krempa Reviewed-by: Pavel Hrdina Reviewed-by: Ján Tomko --- src/qemu/qemu_driver.c | 41 ++++++++++++++--------------------------- 1 file changed, 14 insertions(+), 27 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 28c619fe90..1f796b9d08 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -14412,17 +14412,12 @@ qemuDomainBlockPullCommon(virDomainObj *vm, unsigned int flags) { qemuDomainObjPrivate *priv = vm->privateData; - const char *device = NULL; - const char *jobname = NULL; virDomainDiskDef *disk; virStorageSource *baseSource = NULL; - g_autofree char *basePath = NULL; g_autofree char *backingPath = NULL; unsigned long long speed = bandwidth; qemuBlockJobData *job = NULL; - bool persistjob = false; const char *nodebase = NULL; - bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV); int ret = -1; if (flags & VIR_DOMAIN_BLOCK_REBASE_RELATIVE && !base) { @@ -14457,8 +14452,7 @@ qemuDomainBlockPullCommon(virDomainObj *vm, if (baseSource) { if (flags & VIR_DOMAIN_BLOCK_REBASE_RELATIVE) { - if (blockdev && - qemuBlockUpdateRelativeBacking(vm, disk->src, disk->src) < 0) + if (qemuBlockUpdateRelativeBacking(vm, disk->src, disk->src) < 0) goto endjob; if (virStorageSourceGetRelativeBackingPath(disk->src->backingStore, @@ -14488,29 +14482,22 @@ qemuDomainBlockPullCommon(virDomainObj *vm, if (!(job = qemuBlockJobDiskNewPull(vm, disk, baseSource, flags))) goto endjob; - if (blockdev) { - jobname = job->name; - persistjob = true; - if (baseSource) { - nodebase = baseSource->nodeformat; - if (!backingPath && - !(backingPath = qemuBlockGetBackingStoreString(baseSource, false))) - goto endjob; - } - device = disk->src->nodeformat; - } else { - device = job->name; + if (baseSource) { + nodebase = baseSource->nodeformat; + if (!backingPath && + !(backingPath = qemuBlockGetBackingStoreString(baseSource, false))) + goto endjob; } qemuDomainObjEnterMonitor(vm); - if (!blockdev && baseSource) - basePath = qemuMonitorDiskNameLookup(priv->mon, device, disk->src, - baseSource); - - if (blockdev || - (!baseSource || basePath)) - ret = qemuMonitorBlockStream(priv->mon, device, jobname, persistjob, basePath, - nodebase, backingPath, speed); + ret = qemuMonitorBlockStream(priv->mon, + disk->src->nodeformat, + job->name, + true, + NULL, + nodebase, + backingPath, + speed); qemuDomainObjExitMonitor(vm); if (ret < 0) -- 2.39.5