External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: Rename DEFAULT_JOB_MASK to QEMU_DEFAULT_JOB_MASK

Browse Source 
Be consistent with naming of private defines. Also line up code
correctly in few places where the macro is used.
This commit is contained in:
Peter Krempa 2014-09-03 13:16:41 +02:00
parent a48362cdfe
commit 4be8855699
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_domain.c
View File

@ -162,7 +162,7 @@ qemuDomainObjResetAsyncJob(qemuDomainObjPrivatePtr priv)
job->asyncJob = QEMU_ASYNC_JOB_NONE; job->asyncJob = QEMU_ASYNC_JOB_NONE;
job->asyncOwner = 0; job->asyncOwner = 0;
job->phase = 0; job->phase = 0;
job->mask = DEFAULT_JOB_MASK; job->mask = QEMU_JOB_DEFAULT_MASK;
job->start = 0; job->start = 0;
job->dump_memory_only = false; job->dump_memory_only = false;
job->asyncAbort = false; job->asyncAbort = false;

2
src/qemu/qemu_domain.h
View File

@ -54,7 +54,7 @@
# endif # endif
# define JOB_MASK(job) (1 << (job - 1)) # 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_QUERY) | \
JOB_MASK(QEMU_JOB_DESTROY) | \ JOB_MASK(QEMU_JOB_DESTROY) | \
JOB_MASK(QEMU_JOB_ABORT)) JOB_MASK(QEMU_JOB_ABORT))

6
src/qemu/qemu_driver.c
View File

@ -13207,9 +13207,9 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn,
goto endjob; goto endjob;
/* allow the migration job to be cancelled or the domain to be paused */ /* allow the migration job to be cancelled or the domain to be paused */
qemuDomainObjSetAsyncJobMask(vm, DEFAULT_JOB_MASK | qemuDomainObjSetAsyncJobMask(vm, (QEMU_JOB_DEFAULT_MASK |
JOB_MASK(QEMU_JOB_SUSPEND) | JOB_MASK(QEMU_JOB_SUSPEND) |
JOB_MASK(QEMU_JOB_MIGRATION_OP)); JOB_MASK(QEMU_JOB_MIGRATION_OP)));
cfg = virQEMUDriverGetConfig(driver); cfg = virQEMUDriverGetConfig(driver);
if (cfg->snapshotImageFormat) { if (cfg->snapshotImageFormat) {
@ -13241,7 +13241,7 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn,
memory_unlink = true; memory_unlink = true;
/* forbid any further manipulation */ /* forbid any further manipulation */
qemuDomainObjSetAsyncJobMask(vm, DEFAULT_JOB_MASK); qemuDomainObjSetAsyncJobMask(vm, QEMU_JOB_DEFAULT_MASK);
} }
/* now the domain is now paused if: /* now the domain is now paused if:

4
src/qemu/qemu_migration.c
View File

@ -4907,9 +4907,9 @@ qemuMigrationJobStart(virQEMUDriverPtr driver,
if (job == QEMU_ASYNC_JOB_MIGRATION_IN) { if (job == QEMU_ASYNC_JOB_MIGRATION_IN) {
qemuDomainObjSetAsyncJobMask(vm, QEMU_JOB_NONE); qemuDomainObjSetAsyncJobMask(vm, QEMU_JOB_NONE);
} else { } else {
qemuDomainObjSetAsyncJobMask(vm, DEFAULT_JOB_MASK | qemuDomainObjSetAsyncJobMask(vm, (QEMU_JOB_DEFAULT_MASK |
JOB_MASK(QEMU_JOB_SUSPEND) | JOB_MASK(QEMU_JOB_SUSPEND) |
JOB_MASK(QEMU_JOB_MIGRATION_OP)); JOB_MASK(QEMU_JOB_MIGRATION_OP)));
} }
priv->job.info.type = VIR_DOMAIN_JOB_UNBOUNDED; priv->job.info.type = VIR_DOMAIN_JOB_UNBOUNDED;