|
 |
9119d9 |
From c2e856d8cc824e86a386d1ff01034174cbb3ffbc Mon Sep 17 00:00:00 2001
|
|
|
9119d9 |
Message-Id: <c2e856d8cc824e86a386d1ff01034174cbb3ffbc@dist-git>
|
|
|
9119d9 |
From: Peter Krempa <pkrempa@redhat.com>
|
|
|
9119d9 |
Date: Mon, 8 Sep 2014 13:24:16 +0200
|
|
|
9119d9 |
Subject: [PATCH] qemu: Rename DEFAULT_JOB_MASK to QEMU_DEFAULT_JOB_MASK
|
|
|
9119d9 |
|
|
|
9119d9 |
https://bugzilla.redhat.com/show_bug.cgi?id=1134154
|
|
|
9119d9 |
|
|
|
9119d9 |
Be consistent with naming of private defines. Also line up code
|
|
|
9119d9 |
correctly in few places where the macro is used.
|
|
|
9119d9 |
|
|
|
9119d9 |
(cherry picked from commit 4be88556996c8472d569a611feb6051d05061700)
|
|
|
9119d9 |
|
|
|
9119d9 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
9119d9 |
---
|
|
|
9119d9 |
src/qemu/qemu_domain.c | 2 +-
|
|
|
9119d9 |
src/qemu/qemu_domain.h | 2 +-
|
|
|
9119d9 |
src/qemu/qemu_driver.c | 8 ++++----
|
|
|
9119d9 |
src/qemu/qemu_migration.c | 6 +++---
|
|
|
9119d9 |
4 files changed, 9 insertions(+), 9 deletions(-)
|
|
|
9119d9 |
|
|
|
9119d9 |
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
|
|
|
9119d9 |
index e9506e0..306ff10 100644
|
|
|
9119d9 |
--- a/src/qemu/qemu_domain.c
|
|
|
9119d9 |
+++ b/src/qemu/qemu_domain.c
|
|
|
9119d9 |
@@ -162,7 +162,7 @@ qemuDomainObjResetAsyncJob(qemuDomainObjPrivatePtr priv)
|
|
|
9119d9 |
job->asyncJob = QEMU_ASYNC_JOB_NONE;
|
|
|
9119d9 |
job->asyncOwner = 0;
|
|
|
9119d9 |
job->phase = 0;
|
|
|
9119d9 |
- job->mask = DEFAULT_JOB_MASK;
|
|
|
9119d9 |
+ job->mask = QEMU_JOB_DEFAULT_MASK;
|
|
|
9119d9 |
job->start = 0;
|
|
|
9119d9 |
job->dump_memory_only = false;
|
|
|
9119d9 |
job->asyncAbort = false;
|
|
|
9119d9 |
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
|
|
|
9119d9 |
index 8736889..f353d90 100644
|
|
|
9119d9 |
--- a/src/qemu/qemu_domain.h
|
|
|
9119d9 |
+++ b/src/qemu/qemu_domain.h
|
|
|
9119d9 |
@@ -54,7 +54,7 @@
|
|
|
9119d9 |
# endif
|
|
|
9119d9 |
|
|
|
9119d9 |
# define JOB_MASK(job) (1 << (job - 1))
|
|
|
9119d9 |
-# define DEFAULT_JOB_MASK \
|
|
|
9119d9 |
+# define QEMU_JOB_DEFAULT_MASK \
|
|
|
9119d9 |
(JOB_MASK(QEMU_JOB_QUERY) | \
|
|
|
9119d9 |
JOB_MASK(QEMU_JOB_DESTROY) | \
|
|
|
9119d9 |
JOB_MASK(QEMU_JOB_ABORT))
|
|
|
9119d9 |
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
|
|
|
9119d9 |
index aceddb1..74d0477 100644
|
|
|
9119d9 |
--- a/src/qemu/qemu_driver.c
|
|
|
9119d9 |
+++ b/src/qemu/qemu_driver.c
|
|
|
9119d9 |
@@ -13215,9 +13215,9 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn,
|
|
|
9119d9 |
goto endjob;
|
|
|
9119d9 |
|
|
|
9119d9 |
/* allow the migration job to be cancelled or the domain to be paused */
|
|
|
9119d9 |
- qemuDomainObjSetAsyncJobMask(vm, DEFAULT_JOB_MASK |
|
|
|
9119d9 |
- JOB_MASK(QEMU_JOB_SUSPEND) |
|
|
|
9119d9 |
- JOB_MASK(QEMU_JOB_MIGRATION_OP));
|
|
|
9119d9 |
+ qemuDomainObjSetAsyncJobMask(vm, (QEMU_JOB_DEFAULT_MASK |
|
|
|
9119d9 |
+ JOB_MASK(QEMU_JOB_SUSPEND) |
|
|
|
9119d9 |
+ JOB_MASK(QEMU_JOB_MIGRATION_OP)));
|
|
|
9119d9 |
|
|
|
9119d9 |
cfg = virQEMUDriverGetConfig(driver);
|
|
|
9119d9 |
if (cfg->snapshotImageFormat) {
|
|
|
9119d9 |
@@ -13249,7 +13249,7 @@ qemuDomainSnapshotCreateActiveExternal(virConnectPtr conn,
|
|
|
9119d9 |
memory_unlink = true;
|
|
|
9119d9 |
|
|
|
9119d9 |
/* forbid any further manipulation */
|
|
|
9119d9 |
- qemuDomainObjSetAsyncJobMask(vm, DEFAULT_JOB_MASK);
|
|
|
9119d9 |
+ qemuDomainObjSetAsyncJobMask(vm, QEMU_JOB_DEFAULT_MASK);
|
|
|
9119d9 |
}
|
|
|
9119d9 |
|
|
|
9119d9 |
/* now the domain is now paused if:
|
|
|
9119d9 |
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
|
|
|
9119d9 |
index 9cfb77e..a7aeca5 100644
|
|
|
9119d9 |
--- a/src/qemu/qemu_migration.c
|
|
|
9119d9 |
+++ b/src/qemu/qemu_migration.c
|
|
|
9119d9 |
@@ -4907,9 +4907,9 @@ qemuMigrationJobStart(virQEMUDriverPtr driver,
|
|
|
9119d9 |
if (job == QEMU_ASYNC_JOB_MIGRATION_IN) {
|
|
|
9119d9 |
qemuDomainObjSetAsyncJobMask(vm, QEMU_JOB_NONE);
|
|
|
9119d9 |
} else {
|
|
|
9119d9 |
- qemuDomainObjSetAsyncJobMask(vm, DEFAULT_JOB_MASK |
|
|
|
9119d9 |
- JOB_MASK(QEMU_JOB_SUSPEND) |
|
|
|
9119d9 |
- JOB_MASK(QEMU_JOB_MIGRATION_OP));
|
|
|
9119d9 |
+ qemuDomainObjSetAsyncJobMask(vm, (QEMU_JOB_DEFAULT_MASK |
|
|
|
9119d9 |
+ JOB_MASK(QEMU_JOB_SUSPEND) |
|
|
|
9119d9 |
+ JOB_MASK(QEMU_JOB_MIGRATION_OP)));
|
|
|
9119d9 |
}
|
|
|
9119d9 |
|
|
|
9119d9 |
priv->job.info.type = VIR_DOMAIN_JOB_UNBOUNDED;
|
|
|
9119d9 |
--
|
|
|
9119d9 |
2.1.0
|
|
|
9119d9 |
|