]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: Check for job being set when getting iothread stats
authorMichal Privoznik <mprivozn@redhat.com>
Thu, 7 Nov 2019 12:43:21 +0000 (13:43 +0100)
committerMichal Privoznik <mprivozn@redhat.com>
Fri, 8 Nov 2019 15:25:51 +0000 (16:25 +0100)
The qemuDomainGetStatsIOThread() accesses the monitor by calling
qemuDomainGetIOThreadsMon(). And it's also marked as "need
monitor" in qemuDomainGetStatsWorkers[]. However, it's not
checking if acquiring job was successful.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
src/qemu/qemu_driver.c

index 56fcba8b2cb246f5476b9a58bf6f615b68c322cb..abfb540d808e7cf8b9756aa7be61c963ae6d3f3c 100644 (file)
@@ -21194,7 +21194,7 @@ static int
 qemuDomainGetStatsIOThread(virQEMUDriverPtr driver,
                            virDomainObjPtr dom,
                            virTypedParamListPtr params,
-                           unsigned int privflags G_GNUC_UNUSED)
+                           unsigned int privflags)
 {
     qemuDomainObjPrivatePtr priv = dom->privateData;
     size_t i;
@@ -21202,7 +21202,7 @@ qemuDomainGetStatsIOThread(virQEMUDriverPtr driver,
     int niothreads;
     int ret = -1;
 
-    if (!virDomainObjIsActive(dom))
+    if (!HAVE_JOB(privflags) || !virDomainObjIsActive(dom))
         return 0;
 
     if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_IOTHREAD))