]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: domain: Don't overwrite job type in private data
authorPeter Krempa <pkrempa@redhat.com>
Thu, 1 Mar 2018 17:01:08 +0000 (18:01 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Tue, 13 Mar 2018 12:54:11 +0000 (13:54 +0100)
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>
src/qemu/qemu_domain.c

index 78c09f1abe7bb9e1ef4bdcefb025f11360cbfbac..6a744aec05fb4969385e2acad1941b1f2384a089 100644 (file)
@@ -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;
 }