External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-07 09:19:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Do not use qemuMonitorSetMigrationCapability

Browse Source 
Rework all remaining callers of qemuMonitorSetMigrationCapability to use
the new qemuMonitorSetMigrationCapabilities API.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Jiri Denemark 2018-03-01 10:51:53 +01:00
parent 0801e0e375
commit 1f8a1a9511
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/qemu/qemu_migration_params.c
View File

@ -487,6 +487,7 @@ qemuMigrationCapsCheck(virQEMUDriverPtr driver,
int asyncJob) int asyncJob)
{ {
qemuDomainObjPrivatePtr priv = vm->privateData; qemuDomainObjPrivatePtr priv = vm->privateData;
virBitmapPtr migEvent = NULL;
char **caps = NULL; char **caps = NULL;
char **capStr; char **capStr;
int ret = -1; int ret = -1;
@ -521,12 +522,16 @@ qemuMigrationCapsCheck(virQEMUDriverPtr driver,
} }
if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_EVENT)) { if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_EVENT)) {
migEvent = virBitmapNew(QEMU_MONITOR_MIGRATION_CAPS_LAST);
if (!migEvent)
goto cleanup;
ignore_value(virBitmapSetBit(migEvent, QEMU_MONITOR_MIGRATION_CAPS_EVENTS));
if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0) if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
goto cleanup; goto cleanup;
rc = qemuMonitorSetMigrationCapability(priv->mon, rc = qemuMonitorSetMigrationCapabilities(priv->mon, migEvent, migEvent);
QEMU_MONITOR_MIGRATION_CAPS_EVENTS,
true);
if (qemuDomainObjExitMonitor(driver, vm) < 0) if (qemuDomainObjExitMonitor(driver, vm) < 0)
goto cleanup; goto cleanup;

16
tests/qemumonitorjsontest.c
View File

@ -2229,13 +2229,14 @@ testQemuMonitorJSONqemuMonitorJSONGetTargetArch(const void *data)
} }
static int static int
testQemuMonitorJSONqemuMonitorJSONGetMigrationCapability(const void *data) testQemuMonitorJSONqemuMonitorJSONGetMigrationCapabilities(const void *data)
{ {
virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data; virDomainXMLOptionPtr xmlopt = (virDomainXMLOptionPtr)data;
qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt); qemuMonitorTestPtr test = qemuMonitorTestNewSimple(true, xmlopt);
int ret = -1; int ret = -1;
const char *cap; const char *cap;
char **caps = NULL; char **caps = NULL;
virBitmapPtr bitmap = NULL;
const char *reply = const char *reply =
"{" "{"
" \"return\": [" " \"return\": ["
@ -2266,15 +2267,20 @@ testQemuMonitorJSONqemuMonitorJSONGetMigrationCapability(const void *data)
goto cleanup; goto cleanup;
} }
if (qemuMonitorJSONSetMigrationCapability(qemuMonitorTestGetMonitor(test), bitmap = virBitmapNew(QEMU_MONITOR_MIGRATION_CAPS_LAST);
QEMU_MONITOR_MIGRATION_CAPS_XBZRLE, if (!bitmap)
true) < 0) goto cleanup;
ignore_value(virBitmapSetBit(bitmap, QEMU_MONITOR_MIGRATION_CAPS_XBZRLE));
if (qemuMonitorJSONSetMigrationCapabilities(qemuMonitorTestGetMonitor(test),
bitmap, bitmap) < 0)
goto cleanup; goto cleanup;
ret = 0; ret = 0;
cleanup: cleanup:
qemuMonitorTestFree(test); qemuMonitorTestFree(test);
virStringListFree(caps); virStringListFree(caps);
virBitmapFree(bitmap);
return ret; return ret;
} }
@ -2999,7 +3005,7 @@ mymain(void)
DO_TEST(qemuMonitorJSONGetChardevInfo); DO_TEST(qemuMonitorJSONGetChardevInfo);
DO_TEST(qemuMonitorJSONSetBlockIoThrottle); DO_TEST(qemuMonitorJSONSetBlockIoThrottle);
DO_TEST(qemuMonitorJSONGetTargetArch); DO_TEST(qemuMonitorJSONGetTargetArch);
DO_TEST(qemuMonitorJSONGetMigrationCapability); DO_TEST(qemuMonitorJSONGetMigrationCapabilities);
DO_TEST(qemuMonitorJSONQueryCPUs); DO_TEST(qemuMonitorJSONQueryCPUs);
DO_TEST(qemuMonitorJSONGetVirtType); DO_TEST(qemuMonitorJSONGetVirtType);
DO_TEST(qemuMonitorJSONSendKey); DO_TEST(qemuMonitorJSONSendKey);