From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 30 Mar 2020 09:18:37 +0000 (+0200)
Subject: qemuDomainSnapshotDiskPrepareOne: Don't load the relative path with blockdev
X-Git-Tag: v6.2.0~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ace7a87a8aced68c2504fd4dd4e2df4302c3eeb;p=thirdparty%2Flibvirt.git

qemuDomainSnapshotDiskPrepareOne: Don't load the relative path with blockdev

Since we are refreshing the relative paths when doing the blockjobs we
no longer need to load them upfront when doing the snapshot.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index ae38b9c914..78024614cf 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -15167,8 +15167,9 @@ qemuDomainSnapshotDiskPrepareOne(virQEMUDriverPtr driver,
         dd->initialized = true;
 
         /* relative backing store paths need to be updated so that relative
-         * block commit still works */
-        if (reuse) {
+         * block commit still works. With blockdev we must update it when doing
+         * commit anyways so it's skipped here */
+        if (reuse && !blockdev) {
             if (supportsBacking) {
                 g_autofree char *backingStoreStr = NULL;