From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 5 May 2020 06:51:49 +0000 (+0200)
Subject: qemuDomainSetBlockThreshold: Call qemuBlockNodeNamesDetect only without blockdev
X-Git-Tag: v6.4.0-rc1~129
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fdf6aeb7ae24351662d25631a2f9df2de3b2318;p=thirdparty%2Flibvirt.git

qemuDomainSetBlockThreshold: Call qemuBlockNodeNamesDetect only without blockdev

Make sure that we don't try to reload node names with -blockdev. If
something doesn't have a node name the update will not make the
situation better.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index c5e6cab817..cb0373bf76 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -22597,7 +22597,8 @@ qemuDomainSetBlockThreshold(virDomainPtr dom,
     if (!(src = qemuDomainGetStorageSourceByDevstr(dev, vm->def)))
         goto endjob;
 
-    if (!src->nodestorage &&
+    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV) &&
+        !src->nodestorage &&
         qemuBlockNodeNamesDetect(driver, vm, QEMU_ASYNC_JOB_NONE) < 0)
         goto endjob;