From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 22 Nov 2019 16:39:43 +0000 (+0100)
Subject: qemu: Always reset @info in qemuDomainGetJobInfo
X-Git-Tag: v6.0.0-rc1~533
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab163144eb60b22d4b13becd76564ae610c8e903;p=thirdparty%2Flibvirt.git

qemu: Always reset @info in qemuDomainGetJobInfo

qemuDomainGetJobInfo didn't always reset the return data in @info.
Thankfully this wouldn't be a problem as the RPC layer does it but we
should do it anyways.

Since we reset the struct we don't have to set the type to
VIR_DOMAIN_JOB_NONE as the value is 0.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 348bddbac4..1911073f3e 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -13926,6 +13926,8 @@ qemuDomainGetJobInfo(virDomainPtr dom,
     virDomainObjPtr vm;
     int ret = -1;
 
+    memset(info, 0, sizeof(*info));
+
     if (!(vm = qemuDomainObjFromDomain(dom)))
         goto cleanup;
 
@@ -13936,8 +13938,6 @@ qemuDomainGetJobInfo(virDomainPtr dom,
         goto cleanup;
 
     if (jobInfo.status == QEMU_DOMAIN_JOB_STATUS_NONE) {
-        memset(info, 0, sizeof(*info));
-        info->type = VIR_DOMAIN_JOB_NONE;
         ret = 0;
         goto cleanup;
     }