diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index e9506e0a63..306ff10d04 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -162,7 +162,7 @@ qemuDomainObjResetAsyncJob(qemuDomainObjPrivatePtr priv) job->asyncJob = QEMU_ASYNC_JOB_NONE; job->asyncOwner = 0; job->phase = 0; - job->mask = DEFAULT_JOB_MASK; + job->mask = QEMU_JOB_DEFAULT_MASK; job->start = 0; job->dump_memory_only = false; job->asyncAbort = false; diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 8736889ee7..f353d90b37 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -54,7 +54,7 @@ # endif # define JOB_MASK(job) (1 << (job - 1)) -# define DEFAULT_JOB_MASK \ +# define QEMU_JOB_DEFAULT_MASK \ (JOB_MASK(QEMU_JOB_QUERY) | \ JOB_MASK(QEMU_JOB_DESTROY) | \ JOB_MASK(QEMU_JOB_ABORT)) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 4bf754f072..cd62fec0af 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -13207,9 +13207,9 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, goto endjob; /* allow the migration job to be cancelled or the domain to be paused */ - qemuDomainObjSetAsyncJobMask(vm, DEFAULT_JOB_MASK | - JOB_MASK(QEMU_JOB_SUSPEND) | - JOB_MASK(QEMU_JOB_MIGRATION_OP)); + qemuDomainObjSetAsyncJobMask(vm, (QEMU_JOB_DEFAULT_MASK | + JOB_MASK(QEMU_JOB_SUSPEND) | + JOB_MASK(QEMU_JOB_MIGRATION_OP))); cfg = virQEMUDriverGetConfig(driver); if (cfg->snapshotImageFormat) { @@ -13241,7 +13241,7 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn, memory_unlink = true; /* forbid any further manipulation */ - qemuDomainObjSetAsyncJobMask(vm, DEFAULT_JOB_MASK); + qemuDomainObjSetAsyncJobMask(vm, QEMU_JOB_DEFAULT_MASK); } /* now the domain is now paused if: diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 6bdee4ebe0..f2b421eaef 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -4907,9 +4907,9 @@ qemuMigrationJobStart(virQEMUDriverPtr driver, if (job == QEMU_ASYNC_JOB_MIGRATION_IN) { qemuDomainObjSetAsyncJobMask(vm, QEMU_JOB_NONE); } else { - qemuDomainObjSetAsyncJobMask(vm, DEFAULT_JOB_MASK | - JOB_MASK(QEMU_JOB_SUSPEND) | - JOB_MASK(QEMU_JOB_MIGRATION_OP)); + qemuDomainObjSetAsyncJobMask(vm, (QEMU_JOB_DEFAULT_MASK | + JOB_MASK(QEMU_JOB_SUSPEND) | + JOB_MASK(QEMU_JOB_MIGRATION_OP))); } priv->job.info.type = VIR_DOMAIN_JOB_UNBOUNDED;