From: Peter Krempa <pkre...@redhat.com>
'qemuBuildThrottleFiltersAttachPrepareBlockdev' can fail when
constructing JSON props, but otherwise always retruns a pointer even if
there's nothing to do.
The code in 'qemuDomainAttachDiskGeneric' didn't handle this properly as
it considered NULL as "nothing to do". Return the failure instead and
check if tere's something to do by looking at 'nfilterdata'
Signed-off-by: Peter Krempa <pkre...@redhat.com>
---
src/qemu/qemu_hotplug.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 9977662a2c..02636c9531 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -740,10 +740,15 @@ qemuDomainAttachDiskGeneric(virDomainObj *vm,
if (rc < 0)
goto rollback;
- if ((filterData =
qemuBuildThrottleFiltersAttachPrepareBlockdev(disk))) {
+ if (!(filterData =
qemuBuildThrottleFiltersAttachPrepareBlockdev(disk)))
+ return -1;
+
+ if (filterData->nfilterdata > 0) {
if (qemuDomainObjEnterMonitorAsync(vm, asyncJob) < 0)
return -1;
+
rc = qemuBlockThrottleFiltersAttach(priv->mon, filterData);
+
qemuDomainObjExitMonitor(vm);
if (rc < 0)
goto rollback;
--
2.49.0
