qemu_monitor: Fix regression in getting disk capacity

[libvirt] [PATCH] qemu_monitor: Fix regression in getting disk capacity

Michal Privoznik posted 1 patch 5 years, 9 months ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/f6b0a3cca66592225d7471d11c1fbfe5b3df8819.1532615994.git.mprivozn@redhat.com

Test syntax-check passed

src/qemu/qemu_monitor_json.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)

Expand all Fold all

[libvirt] [PATCH] qemu_monitor: Fix regression in getting disk capacity

Posted by Michal Privoznik 5 years, 9 months ago

In dbf990fd31e8 the qemuMonitorJSONBlockStatsUpdateCapacityOne()
was split. However, due to a bug the return value was never set
to something meaningful.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 src/qemu/qemu_monitor_json.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 75d0738b5d..9acf62e0bb 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -2492,14 +2492,15 @@ qemuMonitorJSONBlockStatsUpdateCapacityOne(virJSONValuePtr image,
         goto cleanup;
 
     if (backingChain &&
-        (backing = virJSONValueObjectGetObject(image, "backing-image"))) {
-        ret = qemuMonitorJSONBlockStatsUpdateCapacityOne(backing,
-                                                         dev_name,
-                                                         depth + 1,
-                                                         stats,
-                                                         true);
-    }
+        (backing = virJSONValueObjectGetObject(image, "backing-image")) &&
+        qemuMonitorJSONBlockStatsUpdateCapacityOne(backing,
+                                                   dev_name,
+                                                   depth + 1,
+                                                   stats,
+                                                   true) < 0)
+        goto cleanup;
 
+    ret = 0;
  cleanup:
     VIR_FREE(entry_name);
     return ret;
-- 
2.16.4

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [PATCH] qemu_monitor: Fix regression in getting disk capacity

Posted by Ján Tomko 5 years, 9 months ago

On Thu, Jul 26, 2018 at 04:39:54PM +0200, Michal Privoznik wrote:
>In dbf990fd31e8 the qemuMonitorJSONBlockStatsUpdateCapacityOne()
>was split. However, due to a bug the return value was never set
>to something meaningful.
>
>Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
>---
> src/qemu/qemu_monitor_json.c | 15 ++++++++-------
> 1 file changed, 8 insertions(+), 7 deletions(-)
>

Reviewed-by: Ján Tomko <jtomko@redhat.com>

Jano
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list