qemu: move macros QEMU_X into hypervisor as VIR_X

It makes sense to have these in the same file as the definitions
of enums.

Signed-off-by: Kristina Hanicova <khanicov@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/hypervisor/domain_job.h b/src/hypervisor/domain_job.h
index b9d11075805105016fe36e2c506582964917b4db..4f165f730d5e0a687eb8999c30c198ca638e0909 100644 (file)
--- a/src/hypervisor/domain_job.h
+++ b/src/hypervisor/domain_job.h
@@ -8,6 +8,18 @@
 #include "internal.h"
 #include "virenum.h"
 
+#define JOB_MASK(job)                  (job == 0 ? 0 : 1 << (job - 1))
+#define VIR_JOB_DEFAULT_MASK \
+    (JOB_MASK(VIR_JOB_QUERY) | \
+     JOB_MASK(VIR_JOB_DESTROY) | \
+     JOB_MASK(VIR_JOB_ABORT))
+
+/* Jobs which have to be tracked in domain state XML. */
+#define VIR_DOMAIN_TRACK_JOBS \
+    (JOB_MASK(VIR_JOB_DESTROY) | \
+     JOB_MASK(VIR_JOB_ASYNC))
+
+
 /* Only 1 job is allowed at any time
  * A job includes *all* monitor commands, even those just querying
  * information, not merely actions */

diff --git a/src/qemu/qemu_backup.c b/src/qemu/qemu_backup.c
index 5d24155628be6e9b1ac04237d1720ee3886a5cc4..427c090dd8b0259f1d4defc776fcde5f2f719e5b 100644 (file)
--- a/src/qemu/qemu_backup.c
+++ b/src/qemu/qemu_backup.c
@@ -795,7 +795,7 @@ qemuBackupBegin(virDomainObj *vm,
                                    VIR_DOMAIN_JOB_OPERATION_BACKUP, flags) < 0)
         return -1;
 
-    qemuDomainObjSetAsyncJobMask(vm, (QEMU_JOB_DEFAULT_MASK |
+    qemuDomainObjSetAsyncJobMask(vm, (VIR_JOB_DEFAULT_MASK |
                                       JOB_MASK(VIR_JOB_SUSPEND) |
                                       JOB_MASK(VIR_JOB_MODIFY)));
     qemuDomainJobSetStatsType(priv->job.current,

diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c
index 8c0125d5d9e62a320bc88e68672534d85b476bee..56a3f6cb1918dd1b0003f0359ec602221adbaee5 100644 (file)
--- a/src/qemu/qemu_domainjob.c
+++ b/src/qemu/qemu_domainjob.c
@@ -204,7 +204,7 @@ qemuDomainObjResetAsyncJob(qemuDomainJobObj *job)
     g_clear_pointer(&job->asyncOwnerAPI, g_free);
     job->asyncStarted = 0;
     job->phase = 0;
-    job->mask = QEMU_JOB_DEFAULT_MASK;
+    job->mask = VIR_JOB_DEFAULT_MASK;
     job->abortJob = false;
     VIR_FREE(job->error);
     g_clear_pointer(&job->current, virDomainJobDataFree);
@@ -256,7 +256,7 @@ qemuDomainObjClearJob(qemuDomainJobObj *job)
 bool
 qemuDomainTrackJob(virDomainJob job)
 {
-    return (QEMU_DOMAIN_TRACK_JOBS & JOB_MASK(job)) != 0;
+    return (VIR_DOMAIN_TRACK_JOBS & JOB_MASK(job)) != 0;
 }
 
 

diff --git a/src/qemu/qemu_domainjob.h b/src/qemu/qemu_domainjob.h
index 6520b42c809509e9f05847c6bf533a046ec97ea3..faf47105a3824d3d59de17b40491e69d8a536b15 100644 (file)
--- a/src/qemu/qemu_domainjob.h
+++ b/src/qemu/qemu_domainjob.h
@@ -22,17 +22,6 @@
 #include "qemu_monitor.h"
 #include "domain_job.h"
 
-#define JOB_MASK(job)                  (job == 0 ? 0 : 1 << (job - 1))
-#define QEMU_JOB_DEFAULT_MASK \
-    (JOB_MASK(VIR_JOB_QUERY) | \
-     JOB_MASK(VIR_JOB_DESTROY) | \
-     JOB_MASK(VIR_JOB_ABORT))
-
-/* Jobs which have to be tracked in domain state XML. */
-#define QEMU_DOMAIN_TRACK_JOBS \
-    (JOB_MASK(VIR_JOB_DESTROY) | \
-     JOB_MASK(VIR_JOB_ASYNC))
-
 
 typedef enum {
     QEMU_DOMAIN_JOB_STATS_TYPE_NONE = 0,

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 9e6ddda91f9517098caea1401bad710a8958e45b..3e653543c635a4908b6a99d20e555c996cde7b6a 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -6107,7 +6107,7 @@ qemuMigrationJobStart(virQEMUDriver *driver,
         mask = VIR_JOB_NONE;
     } else {
         op = VIR_DOMAIN_JOB_OPERATION_MIGRATION_OUT;
-        mask = QEMU_JOB_DEFAULT_MASK |
+        mask = VIR_JOB_DEFAULT_MASK |
                JOB_MASK(VIR_JOB_SUSPEND) |
                JOB_MASK(VIR_JOB_MIGRATION_OP);
     }

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index ddcdfbb1e2e5bd1045d606cdd8c726ac8593a3c3..f110e4f3dd0591d6d126b60db705c5df17f99347 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3657,7 +3657,7 @@ qemuProcessRecoverJob(virQEMUDriver *driver,
         priv->job.asyncOwnerAPI = g_strdup(virThreadJobGet());
         priv->job.asyncStarted = now;
 
-        qemuDomainObjSetAsyncJobMask(vm, (QEMU_JOB_DEFAULT_MASK |
+        qemuDomainObjSetAsyncJobMask(vm, (VIR_JOB_DEFAULT_MASK |
                                           JOB_MASK(VIR_JOB_SUSPEND) |
                                           JOB_MASK(VIR_JOB_MODIFY)));
 
@@ -3682,7 +3682,7 @@ qemuProcessRecoverJob(virQEMUDriver *driver,
         return -1;
 
     /* In case any special handling is added for job type that has been ignored
-     * before, QEMU_DOMAIN_TRACK_JOBS (from qemu_domain.h) needs to be updated
+     * before, VIR_DOMAIN_TRACK_JOBS (from qemu_domain.h) needs to be updated
      * for the job to be properly tracked in domain state XML.
      */
     switch (job->active) {

diff --git a/src/qemu/qemu_snapshot.c b/src/qemu/qemu_snapshot.c
index 661751ac31ec9896c9b4ac4af06291b00cce7350..b62fab7bb3128206c6055854def38c6b92a74aa7 100644 (file)
--- a/src/qemu/qemu_snapshot.c
+++ b/src/qemu/qemu_snapshot.c
@@ -1433,7 +1433,7 @@ qemuSnapshotCreateActiveExternal(virQEMUDriver *driver,
                                   QEMU_DOMAIN_JOB_STATS_TYPE_SAVEDUMP);
 
         /* allow the migration job to be cancelled or the domain to be paused */
-        qemuDomainObjSetAsyncJobMask(vm, (QEMU_JOB_DEFAULT_MASK |
+        qemuDomainObjSetAsyncJobMask(vm, (VIR_JOB_DEFAULT_MASK |
                                           JOB_MASK(VIR_JOB_SUSPEND) |
                                           JOB_MASK(VIR_JOB_MIGRATION_OP)));
 
@@ -1466,7 +1466,7 @@ qemuSnapshotCreateActiveExternal(virQEMUDriver *driver,
             memory_unlink = true;
 
         /* forbid any further manipulation */
-        qemuDomainObjSetAsyncJobMask(vm, QEMU_JOB_DEFAULT_MASK);
+        qemuDomainObjSetAsyncJobMask(vm, VIR_JOB_DEFAULT_MASK);
     }
 
     /* the domain is now paused if a memory snapshot was requested */