From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 21 Jul 2022 11:06:00 +0000 (+0200)
Subject: qemu: driver: Remove remaining QEMU_CAPS_BLOCKDEV capability checks
X-Git-Tag: v8.7.0-rc1~85
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=83273b52149fcec282c7507b9c9a02f030ea7d6f;p=thirdparty%2Flibvirt.git

qemu: driver: Remove remaining QEMU_CAPS_BLOCKDEV capability checks

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_driver.c b/src/qemu/qemu_driver.c
index 3cfe17886d..7d7e4b8ae9 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -9961,9 +9961,7 @@ qemuDomainBlockResize(virDomainPtr dom,
         goto endjob;
     }
 
-    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV) &&
-        !qemuDiskBusIsSD(disk->bus)) {
-
+    if (!qemuDiskBusIsSD(disk->bus)) {
         nodename = disk->src->nodeformat;
     } else {
         if (!(device = qemuAliasDiskDriveFromDisk(disk)))
@@ -16161,8 +16159,7 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
         /* blockdev-based qemu doesn't want to set the throttling when a cdrom
          * is empty. Skip the monitor call here since we will set the throttling
          * once new media is inserted */
-        if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV) ||
-            !virStorageSourceIsEmpty(disk->src)) {
+        if (!virStorageSourceIsEmpty(disk->src)) {
             int rc = 0;
 
             qemuDomainObjEnterMonitor(vm);