33 lines
1.1 KiB
Diff
33 lines
1.1 KiB
Diff
From 2885ef9779a57a964b5d9212702ec06d0ba5573b Mon Sep 17 00:00:00 2001
|
|
From: Peter Krempa <pkrempa@redhat.com>
|
|
Date: Mon, 1 Mar 2021 14:52:03 +0100
|
|
Subject: [PATCH 019/108] qemuMigrationSrcRun: Don't jump to 'exit_monitor'
|
|
from outside of the monitor
|
|
|
|
Failure of 'qemuMigrationSetDBusVMState' would jump to 'exit_monitor'
|
|
but the function isn't called inside of the monitor context.
|
|
|
|
Signed-off-by: Peter Krempa <pkrempa@redhat.com>
|
|
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
|
|
(cherry picked from commit 568d7358ab2c106cefc7b42cd80fb9155d4bb72a)
|
|
---
|
|
src/qemu/qemu_migration.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
|
|
index cd40a886e3..30b92dfb87 100644
|
|
--- a/src/qemu/qemu_migration.c
|
|
+++ b/src/qemu/qemu_migration.c
|
|
@@ -3637,7 +3637,7 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver,
|
|
}
|
|
|
|
if (qemuMigrationSetDBusVMState(driver, vm) < 0)
|
|
- goto exit_monitor;
|
|
+ goto error;
|
|
|
|
/* Before EnterMonitor, since already qemuProcessStopCPUs does that */
|
|
if (!(flags & VIR_MIGRATE_LIVE) &&
|
|
--
|
|
2.33.0
|
|
|