From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 21 Jul 2022 15:14:35 +0000 (+0200)
Subject: qemuDomainDetermineDiskChain: Assume QEMU_CAPS_BLOCKDEV
X-Git-Tag: v8.7.0-rc1~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f385b069c3ed956b8710c9b1fc14e40a0efbd273;p=thirdparty%2Flibvirt.git

qemuDomainDetermineDiskChain: Assume QEMU_CAPS_BLOCKDEV

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

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 4985af3421..a055db74f8 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -7550,8 +7550,6 @@ qemuDomainDetermineDiskChain(virQEMUDriver *driver,
     virStorageSource *src; /* iterator for the backing chain declared in XML */
     virStorageSource *n; /* iterator for the backing chain detected from disk */
     qemuDomainObjPrivate *priv = vm->privateData;
-    bool blockdev = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
-    bool isSD = qemuDiskBusIsSD(disk->bus);
     uid_t uid;
     gid_t gid;
 
@@ -7641,7 +7639,7 @@ qemuDomainDetermineDiskChain(virQEMUDriver *driver,
         qemuDomainPrepareStorageSourceConfig(n, cfg);
         qemuDomainPrepareDiskSourceData(disk, n);
 
-        if (blockdev && !isSD &&
+        if (!qemuDiskBusIsSD(disk->bus) &&
             qemuDomainPrepareStorageSourceBlockdev(disk, n, priv, cfg) < 0)
             return -1;
     }