From 73a352263c1745da8a71f1a636ff805ad3e1d249 Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Thu, 19 Oct 2017 14:22:53 +0200 Subject: [PATCH] qemu: Consistently use exit_monitor in qemuMigrationRun Almost every failure in qemuMigrationRun while we are talking to QEMU monitor results in a jump to exit_monitor label. The only exception is removed by this patch. Signed-off-by: Jiri Denemark Reviewed-by: John Ferlan --- src/qemu/qemu_migration.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 276d7d8f25..bcb0e2a987 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -3770,12 +3770,11 @@ qemuMigrationRun(virQEMUDriverPtr driver, /* explicitly do this *after* we entered the monitor, * as this is a critical section so we are guaranteed * priv->job.abortJob will not change */ - ignore_value(qemuDomainObjExitMonitor(driver, vm)); priv->job.current->status = QEMU_DOMAIN_JOB_STATUS_CANCELED; virReportError(VIR_ERR_OPERATION_ABORTED, _("%s: %s"), qemuDomainAsyncJobTypeToString(priv->job.asyncJob), _("canceled by client")); - goto error; + goto exit_monitor; } if (qemuMonitorSetMigrationSpeed(priv->mon, migrate_speed) < 0) -- 2.39.5