On Wed, Jul 08, 2015 at 18:39:38 +0200, Jiri Denemark wrote:
> Even if QEMU supports migration events it doesn't send them by default.
> We have to enable them by calling migrate-set-capabilities. Let's enable
> migration events everytime we can and clear QEMU_CAPS_MIGRATION_EVENT in
> case migrate-set-capabilities does not support events.
>
> Signed-off-by: Jiri Denemark <jdenemar@xxxxxxxxxx>
> ---
>
> Notes:
> Version 4:
> - new patch
>
> src/qemu/qemu_monitor.c | 2 +-
> src/qemu/qemu_monitor.h | 1 +
> src/qemu/qemu_process.c | 46 ++++++++++++++++++++++++++++++++++------------
> 3 files changed, 36 insertions(+), 13 deletions(-)
>
> diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
> index fb325b6..54695c2 100644
> --- a/src/qemu/qemu_monitor.c
> +++ b/src/qemu/qemu_monitor.c
> @@ -163,7 +163,7 @@ VIR_ENUM_IMPL(qemuMonitorMigrationStatus,
>
> VIR_ENUM_IMPL(qemuMonitorMigrationCaps,
> QEMU_MONITOR_MIGRATION_CAPS_LAST,
> - "xbzrle", "auto-converge", "rdma-pin-all")
> + "xbzrle", "auto-converge", "rdma-pin-all", "events")
>
> VIR_ENUM_IMPL(qemuMonitorVMStatus,
> QEMU_MONITOR_VM_STATUS_LAST,
> diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
> index 8555f7b..ab7d5a7 100644
> --- a/src/qemu/qemu_monitor.h
> +++ b/src/qemu/qemu_monitor.h
> @@ -512,6 +512,7 @@ typedef enum {
> QEMU_MONITOR_MIGRATION_CAPS_XBZRLE,
> QEMU_MONITOR_MIGRATION_CAPS_AUTO_CONVERGE,
> QEMU_MONITOR_MIGRATION_CAPS_RDMA_PIN_ALL,
> + QEMU_MONITOR_MIGRATION_CAPS_EVENTS,
>
> QEMU_MONITOR_MIGRATION_CAPS_LAST
> } qemuMonitorMigrationCaps;
> diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
> index ba84182..04e7e93 100644
> --- a/src/qemu/qemu_process.c
> +++ b/src/qemu/qemu_process.c
> @@ -1546,7 +1546,7 @@ qemuConnectMonitor(virQEMUDriverPtr driver, virDomainObjPtr vm, int asyncJob,
> vm->def) < 0) {
> VIR_ERROR(_("Failed to set security context for monitor for %s"),
> vm->def->name);
> - goto error;
> + return -1;
> }
>
> /* Hold an extra reference because we can't allow 'vm' to be
> @@ -1578,26 +1578,48 @@ qemuConnectMonitor(virQEMUDriverPtr driver, virDomainObjPtr vm, int asyncJob,
> if (virSecurityManagerClearSocketLabel(driver->securityManager, vm->def) < 0) {
> VIR_ERROR(_("Failed to clear security context for monitor for %s"),
> vm->def->name);
> - goto error;
> + return -1;
> }
>
> if (priv->mon == NULL) {
> VIR_INFO("Failed to connect monitor for %s", vm->def->name);
> - goto error;
> + return -1;
> }
>
>
> if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) < 0)
> - goto error;
> - ret = qemuMonitorSetCapabilities(priv->mon);
> - if (ret == 0 &&
> - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MONITOR_JSON))
> - ret = virQEMUCapsProbeQMP(priv->qemuCaps, priv->mon);
> + return -1;
> +
> + if (qemuMonitorSetCapabilities(priv->mon) < 0)
> + goto cleanup;
> +
> + if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MONITOR_JSON) &&
> + virQEMUCapsProbeQMP(priv->qemuCaps, priv->mon) < 0)
> + goto cleanup;
> +
> + if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_EVENT)) {
> + int rv;
> +
> + rv = qemuMonitorGetMigrationCapability(
> + priv->mon, QEMU_MONITOR_MIGRATION_CAPS_EVENTS);
Is it actually worth querying for the capability? Wouldn't it be
sufficient to just set it and if it fails, clear the capability bit
right away?
> + if (rv < 0) {
> + goto cleanup;
> + } else if (rv == 0) {
> + VIR_DEBUG("Cannot enable migration events; clearing capability");
> + virQEMUCapsClear(priv->qemuCaps, QEMU_CAPS_MIGRATION_EVENT);
> + } else if (qemuMonitorSetMigrationCapability(
> + priv->mon,
> + QEMU_MONITOR_MIGRATION_CAPS_EVENTS,
> + true) < 0) {
Hmm, this formatting looks rather ugly to me. Do we still need to do
this silly 80 column limit in the age of wide angle displays?
> + goto cleanup;
> + }
> + }
> +
> + ret = 0;
> +
> + cleanup:
> if (qemuDomainObjExitMonitor(driver, vm) < 0)
> - return -1;
> -
> - error:
> -
> + ret = -1;
> return ret;
Peter
Attachment:
signature.asc
Description: Digital signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list