From ab163144eb60b22d4b13becd76564ae610c8e903 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Fri, 22 Nov 2019 17:39:43 +0100 Subject: [PATCH] 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 Reviewed-by: Eric Blake --- 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 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; }