From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 1 Mar 2018 17:01:08 +0000 (+0100)
Subject: qemu: domain: Don't overwrite job type in private data
X-Git-Tag: v4.2.0-rc1~191
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d33adb9173bcd7b903782243d8925e0f34285595;p=thirdparty%2Flibvirt.git

qemu: domain: Don't overwrite job type in private data

The code overwrote the internal job type and then fixed it back. Since
the job type is not accessed in the code this does not make much sense.
Use the temporary value instead.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 78c09f1abe..6a744aec05 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -2062,15 +2062,14 @@ qemuDomainObjPrivateXMLFormatJob(virBufferPtr buf,
                                  virDomainObjPtr vm,
                                  qemuDomainObjPrivatePtr priv)
 {
-    qemuDomainJob job;
+    qemuDomainJob job = priv->job.active;
 
-    job = priv->job.active;
     if (!qemuDomainTrackJob(job))
-        priv->job.active = QEMU_JOB_NONE;
+        job = QEMU_JOB_NONE;
 
-    if (priv->job.active || priv->job.asyncJob) {
+    if (job || priv->job.asyncJob) {
         virBufferAsprintf(buf, "<job type='%s' async='%s'",
-                          qemuDomainJobTypeToString(priv->job.active),
+                          qemuDomainJobTypeToString(job),
                           qemuDomainAsyncJobTypeToString(priv->job.asyncJob));
         if (priv->job.phase) {
             virBufferAsprintf(buf, " phase='%s'",
@@ -2099,7 +2098,6 @@ qemuDomainObjPrivateXMLFormatJob(virBufferPtr buf,
             virBufferAddLit(buf, "</job>\n");
         }
     }
-    priv->job.active = job;
 }