External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Peter Krempa 2022-10-05 16:54:43 +02:00
parent 08c5c48124
commit 423d93967a
8 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/conf/virdomainjob.c
View File

@ -431,7 +431,7 @@ virDomainObjBeginJobInternal(virDomainObj *obj,
VIR_WARN("Cannot start job (%s, %s, %s) in API %s for domain %s; " VIR_WARN("Cannot start job (%s, %s, %s) in API %s for domain %s; "
"current job is (%s, %s, %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)", "for (%llus, %llus, %llus)",
virDomainJobTypeToString(job), virDomainJobTypeToString(job),
virDomainAgentJobTypeToString(agentJob), virDomainAgentJobTypeToString(agentJob),
@ -550,7 +550,7 @@ virDomainObjBeginAgentJob(virDomainObj *obj,
int virDomainObjBeginAsyncJob(virDomainObj *obj, int virDomainObjBeginAsyncJob(virDomainObj *obj,
virDomainAsyncJob asyncJob, virDomainAsyncJob asyncJob,
virDomainJobOperation operation, virDomainJobOperation operation,
unsigned long apiFlags) unsigned int apiFlags)
{ {
if (virDomainObjBeginJobInternal(obj, obj->job, VIR_JOB_ASYNC, if (virDomainObjBeginJobInternal(obj, obj->job, VIR_JOB_ASYNC,
VIR_AGENT_JOB_NONE, VIR_AGENT_JOB_NONE,

4
src/conf/virdomainjob.h
View File

@ -182,7 +182,7 @@ struct _virDomainJobObj {
virDomainJobData *completed; /* statistics data of a recently completed job */ virDomainJobData *completed; /* statistics data of a recently completed job */
bool abortJob; /* abort of the job requested */ bool abortJob; /* abort of the job requested */
char *error; /* job event completion error */ 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 */ void *privateData; /* job specific collection of data */
virDomainObjPrivateJobCallbacks *cb; virDomainObjPrivateJobCallbacks *cb;
@ -255,7 +255,7 @@ int virDomainObjBeginAgentJob(virDomainObj *obj,
int virDomainObjBeginAsyncJob(virDomainObj *obj, int virDomainObjBeginAsyncJob(virDomainObj *obj,
virDomainAsyncJob asyncJob, virDomainAsyncJob asyncJob,
virDomainJobOperation operation, virDomainJobOperation operation,
unsigned long apiFlags) unsigned int apiFlags)
G_GNUC_WARN_UNUSED_RESULT; G_GNUC_WARN_UNUSED_RESULT;
int virDomainObjBeginNestedJob(virDomainObj *obj, int virDomainObjBeginNestedJob(virDomainObj *obj,
virDomainAsyncJob asyncJob) virDomainAsyncJob asyncJob)

7
src/qemu/qemu_domainjob.c
View File

@ -692,7 +692,7 @@ qemuDomainObjPrivateXMLFormatJob(virBuffer *buf,
} }
if (vm->job->asyncJob != VIR_ASYNC_JOB_NONE) { 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); virBufferAsprintf(&attrBuf, " asyncStarted='%llu'", vm->job->asyncStarted);
} }
@ -758,10 +758,9 @@ qemuDomainObjPrivateXMLParseJob(virDomainObj *vm,
} }
} }
if (virXPathULongHex("string(@flags)", ctxt, &vm->job->apiFlags) == -2) { if (virXMLPropUInt(ctxt->node, "flags", 16, VIR_XML_PROP_NONE,
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid job flags")); &vm->job->apiFlags) < 0)
return -1; return -1;
}
if (vm->job->cb && if (vm->job->cb &&
vm->job->cb->parseJobPrivate(ctxt, job, vm) < 0) vm->job->cb->parseJobPrivate(ctxt, job, vm) < 0)

2
src/qemu/qemu_migration.c
View File

@ -101,7 +101,7 @@ qemuMigrationJobIsAllowed(virDomainObj *vm)
static int ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT static int ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT
qemuMigrationJobStart(virDomainObj *vm, qemuMigrationJobStart(virDomainObj *vm,
virDomainAsyncJob job, virDomainAsyncJob job,
unsigned long apiFlags) unsigned int apiFlags)
{ {
virDomainJobOperation op; virDomainJobOperation op;
unsigned long long mask; unsigned long long mask;

8
src/qemu/qemu_migration_params.c
View File

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

4
src/qemu/qemu_migration_params.h
View File

@ -98,7 +98,7 @@ int
qemuMigrationParamsApply(virDomainObj *vm, qemuMigrationParamsApply(virDomainObj *vm,
int asyncJob, int asyncJob,
qemuMigrationParams *migParams, qemuMigrationParams *migParams,
unsigned long apiFlags); unsigned int apiFlags);
int int
qemuMigrationParamsEnableTLS(virQEMUDriver *driver, qemuMigrationParamsEnableTLS(virQEMUDriver *driver,
@ -145,7 +145,7 @@ void
qemuMigrationParamsReset(virDomainObj *vm, qemuMigrationParamsReset(virDomainObj *vm,
int asyncJob, int asyncJob,
qemuMigrationParams *origParams, qemuMigrationParams *origParams,
unsigned long apiFlags); unsigned int apiFlags);
void void
qemuMigrationParamsFormat(virBuffer *buf, qemuMigrationParamsFormat(virBuffer *buf,

2
src/qemu/qemu_process.c
View File

@ -4689,7 +4689,7 @@ qemuProcessIncomingDefNew(virQEMUCaps *qemuCaps,
int int
qemuProcessBeginJob(virDomainObj *vm, qemuProcessBeginJob(virDomainObj *vm,
virDomainJobOperation operation, virDomainJobOperation operation,
unsigned long apiFlags) unsigned int apiFlags)
{ {
if (virDomainObjBeginAsyncJob(vm, VIR_ASYNC_JOB_START, if (virDomainObjBeginAsyncJob(vm, VIR_ASYNC_JOB_START,
operation, apiFlags) < 0) operation, apiFlags) < 0)

2
src/qemu/qemu_process.h
View File

@ -65,7 +65,7 @@ void qemuProcessIncomingDefFree(qemuProcessIncomingDef *inc);
int qemuProcessBeginJob(virDomainObj *vm, int qemuProcessBeginJob(virDomainObj *vm,
virDomainJobOperation operation, virDomainJobOperation operation,
unsigned long apiFlags); unsigned int apiFlags);
void qemuProcessEndJob(virDomainObj *vm); void qemuProcessEndJob(virDomainObj *vm);
typedef enum { typedef enum {