virDomainJobObj: Use 'unsigned int' instead of 'unsigned long' for 'apiFlags' field

The callers store only an 'unsigned int' in the field. Convert it to the
proper type including parser/formatter.

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

diff --git a/src/conf/virdomainjob.c b/src/conf/virdomainjob.c
index ca0215bc235d0a1e7bd9632aeb4ac5498d2aad2e..256b665a420bc6d58acb1850a1b663cca01c9c79 100644 (file)
--- a/src/conf/virdomainjob.c
+++ b/src/conf/virdomainjob.c
@@ -431,7 +431,7 @@ virDomainObjBeginJobInternal(virDomainObj *obj,
 
     VIR_WARN("Cannot start job (%s, %s, %s) in API %s for domain %s; "
              "current job is (%s, %s, %s) "
-             "owned by (%llu %s, %llu %s, %llu %s (flags=0x%lx)) "
+             "owned by (%llu %s, %llu %s, %llu %s (flags=0x%x)) "
              "for (%llus, %llus, %llus)",
              virDomainJobTypeToString(job),
              virDomainAgentJobTypeToString(agentJob),
@@ -550,7 +550,7 @@ virDomainObjBeginAgentJob(virDomainObj *obj,
 int virDomainObjBeginAsyncJob(virDomainObj *obj,
                               virDomainAsyncJob asyncJob,
                               virDomainJobOperation operation,
-                              unsigned long apiFlags)
+                              unsigned int apiFlags)
 {
     if (virDomainObjBeginJobInternal(obj, obj->job, VIR_JOB_ASYNC,
                                      VIR_AGENT_JOB_NONE,

diff --git a/src/conf/virdomainjob.h b/src/conf/virdomainjob.h
index c1013345968c8ce947974b81e69067b59e06a48c..b1ac36a2fa9c59c41ca772d0990f91d082c63a98 100644 (file)
--- a/src/conf/virdomainjob.h
+++ b/src/conf/virdomainjob.h
@@ -182,7 +182,7 @@ struct _virDomainJobObj {
     virDomainJobData *completed;     /* statistics data of a recently completed job */
     bool abortJob;                      /* abort of the job requested */
     char *error;                        /* job event completion error */
-    unsigned long apiFlags; /* flags passed to the API which started the async job */
+    unsigned int apiFlags; /* flags passed to the API which started the async job */
 
     void *privateData;                  /* job specific collection of data */
     virDomainObjPrivateJobCallbacks *cb;
@@ -255,7 +255,7 @@ int virDomainObjBeginAgentJob(virDomainObj *obj,
 int virDomainObjBeginAsyncJob(virDomainObj *obj,
                               virDomainAsyncJob asyncJob,
                               virDomainJobOperation operation,
-                              unsigned long apiFlags)
+                              unsigned int apiFlags)
     G_GNUC_WARN_UNUSED_RESULT;
 int virDomainObjBeginNestedJob(virDomainObj *obj,
                                virDomainAsyncJob asyncJob)

diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c
index a170fdd97db522f79f033e9e999215224050d933..4d320f075ee99042783a24f8a89e7084fde07a5b 100644 (file)
--- a/src/qemu/qemu_domainjob.c
+++ b/src/qemu/qemu_domainjob.c
@@ -692,7 +692,7 @@ qemuDomainObjPrivateXMLFormatJob(virBuffer *buf,
     }
 
     if (vm->job->asyncJob != VIR_ASYNC_JOB_NONE) {
-        virBufferAsprintf(&attrBuf, " flags='0x%lx'", vm->job->apiFlags);
+        virBufferAsprintf(&attrBuf, " flags='0x%x'", vm->job->apiFlags);
         virBufferAsprintf(&attrBuf, " asyncStarted='%llu'", vm->job->asyncStarted);
     }
 
@@ -758,10 +758,9 @@ qemuDomainObjPrivateXMLParseJob(virDomainObj *vm,
         }
     }
 
-    if (virXPathULongHex("string(@flags)", ctxt, &vm->job->apiFlags) == -2) {
-        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid job flags"));
+    if (virXMLPropUInt(ctxt->node, "flags", 16, VIR_XML_PROP_NONE,
+                       &vm->job->apiFlags) < 0)
         return -1;
-    }
 
     if (vm->job->cb &&
         vm->job->cb->parseJobPrivate(ctxt, job, vm) < 0)

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 76e486fbc790f25878773ce318ed9514a84d7589..615b3178e7c9740e80c15b3d5a4c26fe78c4db76 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -101,7 +101,7 @@ qemuMigrationJobIsAllowed(virDomainObj *vm)
 static int ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT
 qemuMigrationJobStart(virDomainObj *vm,
                       virDomainAsyncJob job,
-                      unsigned long apiFlags)
+                      unsigned int apiFlags)
 {
     virDomainJobOperation op;
     unsigned long long mask;

diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
index 7a023b36c8daeb69332d5866b644a5eee91f68bd..bee0af9fca984866ea7e49cd4b8a04c4be18cb7e 100644 (file)
--- a/src/qemu/qemu_migration_params.c
+++ b/src/qemu/qemu_migration_params.c
@@ -919,7 +919,7 @@ int
 qemuMigrationParamsApply(virDomainObj *vm,
                          int asyncJob,
                          qemuMigrationParams *migParams,
-                         unsigned long apiFlags)
+                         unsigned int apiFlags)
 {
     bool postcopyResume = !!(apiFlags & VIR_MIGRATE_POSTCOPY_RESUME);
     int ret = -1;
@@ -1117,7 +1117,7 @@ static void
 qemuMigrationParamsResetTLS(virDomainObj *vm,
                             int asyncJob,
                             qemuMigrationParams *origParams,
-                            unsigned long apiFlags)
+                            unsigned int apiFlags)
 {
     g_autofree char *tlsAlias = NULL;
     g_autofree char *secAlias = NULL;
@@ -1280,7 +1280,7 @@ void
 qemuMigrationParamsReset(virDomainObj *vm,
                          int asyncJob,
                          qemuMigrationParams *origParams,
-                         unsigned long apiFlags)
+                         unsigned int apiFlags)
 {
     virErrorPtr err;
     g_autoptr(virBitmap) clearCaps = NULL;
@@ -1288,7 +1288,7 @@ qemuMigrationParamsReset(virDomainObj *vm,
 
     virErrorPreserveLast(&err);
 
-    VIR_DEBUG("Resetting migration parameters %p, flags 0x%lx",
+    VIR_DEBUG("Resetting migration parameters %p, flags 0x%x",
               origParams, apiFlags);
 
     if (!virDomainObjIsActive(vm) || !origParams)

diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_params.h
index c58a933ab6765a16271bd441cf85a8b715331e07..5612a4d2836b95d308e91a1859b7ccd8cc59ecbc 100644 (file)
--- a/src/qemu/qemu_migration_params.h
+++ b/src/qemu/qemu_migration_params.h
@@ -98,7 +98,7 @@ int
 qemuMigrationParamsApply(virDomainObj *vm,
                          int asyncJob,
                          qemuMigrationParams *migParams,
-                         unsigned long apiFlags);
+                         unsigned int apiFlags);
 
 int
 qemuMigrationParamsEnableTLS(virQEMUDriver *driver,
@@ -145,7 +145,7 @@ void
 qemuMigrationParamsReset(virDomainObj *vm,
                          int asyncJob,
                          qemuMigrationParams *origParams,
-                         unsigned long apiFlags);
+                         unsigned int apiFlags);
 
 void
 qemuMigrationParamsFormat(virBuffer *buf,

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 81f12a368bab0293031220b93053cdbe1272722e..e7f92228f5a13c5fe439e2a72eafb682045ac23d 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -4689,7 +4689,7 @@ qemuProcessIncomingDefNew(virQEMUCaps *qemuCaps,
 int
 qemuProcessBeginJob(virDomainObj *vm,
                     virDomainJobOperation operation,
-                    unsigned long apiFlags)
+                    unsigned int apiFlags)
 {
     if (virDomainObjBeginAsyncJob(vm, VIR_ASYNC_JOB_START,
                                    operation, apiFlags) < 0)

diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h
index 4dfb2485c013fa562e8dc08e62a9cdd636ba2e5b..d1f58ee258e295dc782f4531eb505625283e9a5c 100644 (file)
--- a/src/qemu/qemu_process.h
+++ b/src/qemu/qemu_process.h
@@ -65,7 +65,7 @@ void qemuProcessIncomingDefFree(qemuProcessIncomingDef *inc);
 
 int qemuProcessBeginJob(virDomainObj *vm,
                         virDomainJobOperation operation,
-                        unsigned long apiFlags);
+                        unsigned int apiFlags);
 void qemuProcessEndJob(virDomainObj *vm);
 
 typedef enum {