[libvirt] [PATCH] qemu: fix unsuitable error report when get memory stats

From: Zhang Bo <oscar.zhangbo(a)huawei.com&gt; when we run the command 'virsh dommemstat xxx', althrough memballoon's model is set 'none' in vm's XML, it still reports an error in libvirtd.log. error : qemuMonitorFindBalloonObjectPath:1042 : internal error: Cannot determine balloon device path Apparently, if we don't set memballoon, we don't need to set balloon device path. Signed-off-by: Wang Yufei <james.wangyufei(a)huawei.com&gt; Signed-off-by: Zhang Bo <oscar.zhangbo(a)huawei.com&gt; --- .gnulib | 2 +- src/qemu/qemu_monitor.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gnulib b/.gnulib index 875ec93..106a386 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 875ec93e1501d2d2a8bab1b64fa66b8ceb51dc67 +Subproject commit 106a3866d01f9dd57ab4f10dbeb0d5a8db73a9f7 diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index f959b74..c72702d 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1711,7 +1711,9 @@ qemuMonitorGetMemoryStats(qemuMonitorPtr mon, QEMU_CHECK_MONITOR(mon); if (mon->json) { - ignore_value(qemuMonitorFindBalloonObjectPath(mon, "/")); + if (mon->vm->def->memballoon && + mon->vm->def->memballoon->model != VIR_DOMAIN_MEMBALLOON_MODEL_NONE) + ignore_value(qemuMonitorFindBalloonObjectPath(mon, "/")); mon->ballooninit = true; return qemuMonitorJSONGetMemoryStats(mon, mon->balloonpath, stats, nr_stats); -- 1.7.12.4