From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 14 Apr 2015 15:08:23 +0000 (+0200)
Subject: qemu: monitor: Fix qemuMonitorGetAllBlockStatsInfo with HMP
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=7961713410b46b36700c78f99af11810552b9dc4;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

qemu: monitor: Fix qemuMonitorGetAllBlockStatsInfo with HMP

Commit f6563bc3 introduced HMP impl of the function (so that a different
uglier function could be removed). Before the HMP code is called there's
a leftover check that the monitor is JSON which inhibits the code from
working.
---

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 0561d528a..1f955473b 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -1873,12 +1873,6 @@ qemuMonitorGetAllBlockStatsInfo(qemuMonitorPtr mon,
     int ret = -1;
     VIR_DEBUG("mon=%p ret_stats=%p, backing=%d", mon, ret_stats, backingChain);
 
-    if (!mon->json) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                       _("unable to query all block stats with this QEMU"));
-        return -1;
-    }
-
     if (!(*ret_stats = virHashCreate(10, virHashValueFree)))
         goto error;