9:41 a.m.
We used to set migration capabilities only when a user asked for them in
flags. This is fine when migration succeeds since the QEMU process is
killed in the end but in case migration fails or if it's cancelled, some
capabilities may remain turned on with no way to turn them off. To fix
that, migration capabilities have to be turned on if requested but
explicitly turned off in case they were not requested but QEMU supports
them.
https://bugzilla.redhat.com/show_bug.cgi?id=1160997
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
src/qemu/qemu_migration.c | 42 +++++++++++++++++++++++++++++-------------
src/qemu/qemu_monitor.c | 5 +++--
src/qemu/qemu_monitor.h | 3 ++-
src/qemu/qemu_monitor_json.c | 5 +++--
src/qemu/qemu_monitor_json.h | 3 ++-
tests/qemumonitorjsontest.c | 3 ++-
6 files changed, 41 insertions(+), 20 deletions(-)
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index c797206..ff692a5 100644
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1804,6 +1804,7 @@ qemuMigrationSetOffline(virQEMUDriverPtr driver,
static int
qemuMigrationSetCompression(virQEMUDriverPtr driver,
virDomainObjPtr vm,
+ bool state,
qemuDomainAsyncJob job)
{
qemuDomainObjPrivatePtr priv = vm->privateData;
@@ -1818,6 +1819,9 @@ qemuMigrationSetCompression(virQEMUDriverPtr driver,
if (ret < 0) {
goto cleanup;
+ } else if (ret == 0 && !state) {
+ /* Unsupported but we want it off anyway */
+ goto cleanup;
} else if (ret == 0) {
if (job == QEMU_ASYNC_JOB_MIGRATION_IN) {
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
@@ -1834,7 +1838,8 @@ qemuMigrationSetCompression(virQEMUDriverPtr driver,
ret = qemuMonitorSetMigrationCapability(
priv->mon,
- QEMU_MONITOR_MIGRATION_CAPS_XBZRLE);
+ QEMU_MONITOR_MIGRATION_CAPS_XBZRLE,
+ state);
cleanup:
qemuDomainObjExitMonitor(driver, vm);
@@ -1844,6 +1849,7 @@ qemuMigrationSetCompression(virQEMUDriverPtr driver,
static int
qemuMigrationSetAutoConverge(virQEMUDriverPtr driver,
virDomainObjPtr vm,
+ bool state,
qemuDomainAsyncJob job)
{
qemuDomainObjPrivatePtr priv = vm->privateData;
@@ -1858,6 +1864,9 @@ qemuMigrationSetAutoConverge(virQEMUDriverPtr driver,
if (ret < 0) {
goto cleanup;
+ } else if (ret == 0 && !state) {
+ /* Unsupported but we want it off anyway */
+ goto cleanup;
} else if (ret == 0) {
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
_("Auto-Converge is not supported by "
@@ -1868,7 +1877,8 @@ qemuMigrationSetAutoConverge(virQEMUDriverPtr driver,
ret = qemuMonitorSetMigrationCapability(
priv->mon,
- QEMU_MONITOR_MIGRATION_CAPS_AUTO_CONVERGE);
+ QEMU_MONITOR_MIGRATION_CAPS_AUTO_CONVERGE,
+ state);
cleanup:
qemuDomainObjExitMonitor(driver, vm);
@@ -1879,6 +1889,7 @@ qemuMigrationSetAutoConverge(virQEMUDriverPtr driver,
static int
qemuMigrationSetPinAll(virQEMUDriverPtr driver,
virDomainObjPtr vm,
+ bool state,
qemuDomainAsyncJob job)
{
qemuDomainObjPrivatePtr priv = vm->privateData;
@@ -1893,6 +1904,9 @@ qemuMigrationSetPinAll(virQEMUDriverPtr driver,
if (ret < 0) {
goto cleanup;
+ } else if (ret == 0 && !state) {
+ /* Unsupported but we want it off anyway */
+ goto cleanup;
} else if (ret == 0) {
if (job == QEMU_ASYNC_JOB_MIGRATION_IN) {
virReportError(VIR_ERR_ARGUMENT_UNSUPPORTED, "%s",
@@ -1909,7 +1923,8 @@ qemuMigrationSetPinAll(virQEMUDriverPtr driver,
ret = qemuMonitorSetMigrationCapability(
priv->mon,
- QEMU_MONITOR_MIGRATION_CAPS_RDMA_PIN_ALL);
+ QEMU_MONITOR_MIGRATION_CAPS_RDMA_PIN_ALL,
+ state);
cleanup:
qemuDomainObjExitMonitor(driver, vm);
@@ -2734,8 +2749,8 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver,
dataFD[1] = -1; /* 'st' owns the FD now & will close it */
}
- if (flags & VIR_MIGRATE_COMPRESSED &&
- qemuMigrationSetCompression(driver, vm,
+ if (qemuMigrationSetCompression(driver, vm,
+ flags & VIR_MIGRATE_COMPRESSED,
QEMU_ASYNC_JOB_MIGRATION_IN) < 0)
goto stop;
@@ -2744,8 +2759,9 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver,
goto stop;
}
- if (flags & VIR_MIGRATE_RDMA_PIN_ALL &&
- qemuMigrationSetPinAll(driver, vm, QEMU_ASYNC_JOB_MIGRATION_IN) < 0)
+ if (qemuMigrationSetPinAll(driver, vm,
+ flags & VIR_MIGRATE_RDMA_PIN_ALL,
+ QEMU_ASYNC_JOB_MIGRATION_IN) < 0)
goto stop;
if (mig->lockState) {
@@ -3568,18 +3584,18 @@ qemuMigrationRun(virQEMUDriverPtr driver,
goto cleanup;
}
- if (flags & VIR_MIGRATE_COMPRESSED &&
- qemuMigrationSetCompression(driver, vm,
+ if (qemuMigrationSetCompression(driver, vm,
+ flags & VIR_MIGRATE_COMPRESSED,
QEMU_ASYNC_JOB_MIGRATION_OUT) < 0)
goto cleanup;
- if (flags & VIR_MIGRATE_AUTO_CONVERGE &&
- qemuMigrationSetAutoConverge(driver, vm,
+ if (qemuMigrationSetAutoConverge(driver, vm,
+ flags & VIR_MIGRATE_AUTO_CONVERGE,
QEMU_ASYNC_JOB_MIGRATION_OUT) < 0)
goto cleanup;
- if (flags & VIR_MIGRATE_RDMA_PIN_ALL &&
- qemuMigrationSetPinAll(driver, vm,
+ if (qemuMigrationSetPinAll(driver, vm,
+ flags & VIR_MIGRATE_RDMA_PIN_ALL,
QEMU_ASYNC_JOB_MIGRATION_OUT) < 0)
goto cleanup;
diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 36ef4e1..d06ef28 100644
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -3928,7 +3928,8 @@ int qemuMonitorGetMigrationCapability(qemuMonitorPtr mon,
}
int qemuMonitorSetMigrationCapability(qemuMonitorPtr mon,
- qemuMonitorMigrationCaps capability)
+ qemuMonitorMigrationCaps capability,
+ bool state)
{
VIR_DEBUG("mon=%p capability=%d", mon, capability);
@@ -3944,7 +3945,7 @@ int qemuMonitorSetMigrationCapability(qemuMonitorPtr mon,
return -1;
}
- return qemuMonitorJSONSetMigrationCapability(mon, capability);
+ return qemuMonitorJSONSetMigrationCapability(mon, capability, state);
}
int qemuMonitorNBDServerStart(qemuMonitorPtr mon,
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 750b3dc..862386a 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -506,7 +506,8 @@ int qemuMonitorGetMigrationCapabilities(qemuMonitorPtr mon,
int qemuMonitorGetMigrationCapability(qemuMonitorPtr mon,
qemuMonitorMigrationCaps capability);
int qemuMonitorSetMigrationCapability(qemuMonitorPtr mon,
- qemuMonitorMigrationCaps capability);
+ qemuMonitorMigrationCaps capability,
+ bool state);
typedef enum {
QEMU_MONITOR_MIGRATE_BACKGROUND = 1 << 0,
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 7870664..bc0bf56 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -5557,7 +5557,8 @@ qemuMonitorJSONGetMigrationCapability(qemuMonitorPtr mon,
int
qemuMonitorJSONSetMigrationCapability(qemuMonitorPtr mon,
- qemuMonitorMigrationCaps capability)
+ qemuMonitorMigrationCaps capability,
+ bool state)
{
int ret = -1;
@@ -5577,7 +5578,7 @@ qemuMonitorJSONSetMigrationCapability(qemuMonitorPtr mon,
qemuMonitorMigrationCapsTypeToString(capability)) < 0)
goto cleanup;
- if (virJSONValueObjectAppendBoolean(cap, "state", 1) < 0)
+ if (virJSONValueObjectAppendBoolean(cap, "state", state) < 0)
goto cleanup;
if (virJSONValueArrayAppend(caps, cap) < 0)
diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
index 6cdaf18..0beadc9 100644
--- a/src/qemu/qemu_monitor_json.h
+++ b/src/qemu/qemu_monitor_json.h
@@ -142,7 +142,8 @@ int qemuMonitorJSONGetMigrationCapabilities(qemuMonitorPtr mon,
int qemuMonitorJSONGetMigrationCapability(qemuMonitorPtr mon,
qemuMonitorMigrationCaps capability);
int qemuMonitorJSONSetMigrationCapability(qemuMonitorPtr mon,
- qemuMonitorMigrationCaps capability);
+ qemuMonitorMigrationCaps capability,
+ bool state);
int qemuMonitorJSONMigrate(qemuMonitorPtr mon,
unsigned int flags,
diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index b8177c0..efed06b 100644
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -1939,7 +1939,8 @@ testQemuMonitorJSONqemuMonitorJSONGetMigrationCapability(const void
*data)
}
if (qemuMonitorJSONSetMigrationCapability(qemuMonitorTestGetMonitor(test),
- QEMU_MONITOR_MIGRATION_CAPS_XBZRLE) <
0)
+ QEMU_MONITOR_MIGRATION_CAPS_XBZRLE,
+ true) < 0)
goto cleanup;
ret = 0;
--
2.1.3