From a9638ae975a1c784d958e3fb2f0aab36b3ebddeb Mon Sep 17 00:00:00 2001 From: Francesco Romani Date: Thu, 11 Dec 2014 08:44:09 +0100 Subject: [PATCH] qemu: bulk stats: Fix logic in monitor handling A logic bug in qemuConnectGetAllDomainStats makes the code mark the monitor as available when qemuDomainObjBeginJob fails, instead of when it succeeds, as the correct flow requires. This patch fixes the check and updates the code documentation accordingly. Broken by commit 57023c0a3af4af1c547189c1f6712ed5edeb0c0b. Signed-off-by: Francesco Romani (cherry picked from commit cb104ef734dfea12cb8826dba7e2c98912c4b7e1) Signed-off-by: Martin Kletzander --- src/qemu/qemu_driver.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 2d0bc85cf2..ffbc2abe91 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -18528,9 +18528,9 @@ qemuConnectGetAllDomainStats(virConnectPtr conn, } if (HAVE_JOB(privflags) && - qemuDomainObjBeginJob(driver, dom, QEMU_JOB_QUERY) < 0) - /* As it was never requested. Gather as much as possible anyway. */ + qemuDomainObjBeginJob(driver, dom, QEMU_JOB_QUERY) == 0) domflags |= QEMU_DOMAIN_STATS_HAVE_JOB; + /* else: without a job it's still possible to gather some data */ if (qemuDomainGetStats(conn, dom, stats, &tmp, domflags) < 0) goto endjob; -- GitLab