]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: Typedef struct qemuDomainJobObj
authorJiri Denemark <jdenemar@redhat.com>
Thu, 29 Mar 2018 14:48:34 +0000 (16:48 +0200)
committerJiri Denemark <jdenemar@redhat.com>
Tue, 17 Apr 2018 08:46:23 +0000 (10:46 +0200)
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
src/qemu/qemu_domain.c
src/qemu/qemu_domain.h
src/qemu/qemu_process.c

index a90301901a4976d19c93239b11365209657827d4..bcc8bf427265767d32cc8d53817b4a05ad743d9f 100644 (file)
@@ -309,7 +309,7 @@ qemuDomainObjInitJob(qemuDomainObjPrivatePtr priv)
 static void
 qemuDomainObjResetJob(qemuDomainObjPrivatePtr priv)
 {
-    struct qemuDomainJobObj *job = &priv->job;
+    qemuDomainJobObjPtr job = &priv->job;
 
     job->active = QEMU_JOB_NONE;
     job->owner = 0;
@@ -320,7 +320,7 @@ qemuDomainObjResetJob(qemuDomainObjPrivatePtr priv)
 static void
 qemuDomainObjResetAsyncJob(qemuDomainObjPrivatePtr priv)
 {
-    struct qemuDomainJobObj *job = &priv->job;
+    qemuDomainJobObjPtr job = &priv->job;
 
     job->asyncJob = QEMU_ASYNC_JOB_NONE;
     job->asyncOwner = 0;
@@ -342,7 +342,7 @@ qemuDomainObjResetAsyncJob(qemuDomainObjPrivatePtr priv)
 
 void
 qemuDomainObjRestoreJob(virDomainObjPtr obj,
-                        struct qemuDomainJobObj *job)
+                        qemuDomainJobObjPtr job)
 {
     qemuDomainObjPrivatePtr priv = obj->privateData;
 
index 229007fa677a309f6acfecb0086a7ca7585947aa..77aa642f0ba647e3f8396a31d2c7fad9291a84dc 100644 (file)
@@ -154,7 +154,9 @@ struct _qemuDomainJobInfo {
     qemuDomainMirrorStats mirrorStats;
 };
 
-struct qemuDomainJobObj {
+typedef struct _qemuDomainJobObj qemuDomainJobObj;
+typedef qemuDomainJobObj *qemuDomainJobObjPtr;
+struct _qemuDomainJobObj {
     virCond cond;                       /* Use to coordinate jobs */
     qemuDomainJob active;               /* Currently running job */
     unsigned long long owner;           /* Thread id which set current job */
@@ -254,7 +256,7 @@ typedef qemuDomainObjPrivate *qemuDomainObjPrivatePtr;
 struct _qemuDomainObjPrivate {
     virQEMUDriverPtr driver;
 
-    struct qemuDomainJobObj job;
+    qemuDomainJobObj job;
 
     virBitmapPtr namespaces;
 
@@ -513,7 +515,7 @@ void qemuDomainObjSetJobPhase(virQEMUDriverPtr driver,
 void qemuDomainObjSetAsyncJobMask(virDomainObjPtr obj,
                                   unsigned long long allowedJobs);
 void qemuDomainObjRestoreJob(virDomainObjPtr obj,
-                             struct qemuDomainJobObj *job);
+                             qemuDomainJobObjPtr job);
 void qemuDomainObjDiscardAsyncJob(virQEMUDriverPtr driver,
                                   virDomainObjPtr obj);
 void qemuDomainObjReleaseAsyncJob(virDomainObjPtr obj);
index 592b23e0ee19a7f3b35589d10a52fb5cad90d24a..9e336e8371f755eef520f766f7dadf31583f0ddb 100644 (file)
@@ -3180,7 +3180,7 @@ qemuProcessRecoverMigrationOut(virQEMUDriverPtr driver,
 static int
 qemuProcessRecoverJob(virQEMUDriverPtr driver,
                       virDomainObjPtr vm,
-                      const struct qemuDomainJobObj *job,
+                      const qemuDomainJobObj *job,
                       unsigned int *stopFlags)
 {
     qemuDomainObjPrivatePtr priv = vm->privateData;
@@ -7256,7 +7256,7 @@ qemuProcessReconnect(void *opaque)
     virQEMUDriverPtr driver = data->driver;
     virDomainObjPtr obj = data->obj;
     qemuDomainObjPrivatePtr priv;
-    struct qemuDomainJobObj oldjob;
+    qemuDomainJobObj oldjob;
     int state;
     int reason;
     virQEMUDriverConfigPtr cfg;