From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 22 Nov 2018 14:05:50 +0000 (+0100)
Subject: qemu: blockjob: Clarify that job 'status' field contains new state
X-Git-Tag: v5.1.0-rc1~458
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3e6a2ea3a013193bba362c3d23441f421d6d651;p=thirdparty%2Flibvirt.git

qemu: blockjob: Clarify that job 'status' field contains new state

The field is used to note the state the job has transitioned to while
handling the blockjob state change event. Rename the field so that it's
obvious that this is the new state and not the general state of the
blockjob.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
index ef71d8f0f9..5c9f263450 100644
--- a/src/qemu/qemu_blockjob.c
+++ b/src/qemu/qemu_blockjob.c
@@ -262,22 +262,22 @@ qemuBlockJobUpdateDisk(virDomainObjPtr vm,
 {
     qemuBlockJobDataPtr job = QEMU_DOMAIN_DISK_PRIVATE(disk)->blockjob;
     qemuDomainObjPrivatePtr priv = vm->privateData;
-    int status = job->status;
+    int state = job->newstate;
 
     if (error)
         *error = NULL;
 
-    if (status != -1) {
+    if (state != -1) {
         qemuBlockJobEventProcessLegacy(priv->driver, vm, disk, asyncJob,
-                                       job->type, status);
-        job->status = -1;
+                                       job->type, state);
+        job->newstate = -1;
         if (error)
             VIR_STEAL_PTR(*error, job->errmsg);
         else
             VIR_FREE(job->errmsg);
     }
 
-    return status;
+    return state;
 }
 
 
@@ -301,7 +301,7 @@ qemuBlockJobSyncBeginDisk(virDomainDiskDefPtr disk)
 
     VIR_DEBUG("disk=%s", disk->dst);
     job->synchronous = true;
-    job->status = -1;
+    job->newstate = -1;
 }
 
 
diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h
index fc794d3d0b..9fda68a205 100644
--- a/src/qemu/qemu_blockjob.h
+++ b/src/qemu/qemu_blockjob.h
@@ -34,9 +34,10 @@ struct _qemuBlockJobData {
 
     bool started;
     int type;
-    int status;
     char *errmsg;
     bool synchronous; /* API call is waiting for this job */
+
+    int newstate; /* virConnectDomainEventBlockJobStatus - new state to be processed */
 };
 
 qemuBlockJobDataPtr qemuBlockJobDataNew(void);
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 7948131010..926b8c7b89 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -4735,7 +4735,7 @@ processBlockJobEvent(virQEMUDriverPtr driver,
     job = QEMU_DOMAIN_DISK_PRIVATE(disk)->blockjob;
 
     job->type = type;
-    job->status = status;
+    job->newstate = status;
 
     qemuBlockJobUpdateDisk(vm, QEMU_ASYNC_JOB_NONE, disk, NULL);
 
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index a75996f2cc..d5bdd0d74d 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -943,7 +943,7 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
     if (job->synchronous) {
         /* We have a SYNC API waiting for this event, dispatch it back */
         job->type = type;
-        job->status = status;
+        job->newstate = status;
         VIR_FREE(job->errmsg);
         ignore_value(VIR_STRDUP_QUIET(job->errmsg, error));
         virDomainObjBroadcast(vm);
@@ -7845,7 +7845,7 @@ qemuProcessRefreshLegacyBlockjob(void *payload,
     }
 
     job->started = true;
-    job->status = -1;
+    job->newstate = -1;
 
     return 0;
 }