52 lines
2.0 KiB
Diff
52 lines
2.0 KiB
Diff
|
From 3347d61ff783d05f41f03097551460dc5825b301 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
Date: Thu, 29 Jul 2021 07:42:14 -0400
|
||
|
|
Subject: [PATCH 11/39] hmp: Fix loadvm to resume the VM on success instead of
|
||
|
|
failure
|
||
|
|
|
||
|
|
RH-Author: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
RH-MergeRequest: 32: Synchronize with RHEL-AV 8.5 release 27 to RHEL 9
|
||
|
|
RH-Commit: [3/15] 492cfb8ef252805b988a256abe73628605f630e9 (mrezanin/centos-src-qemu-kvm)
|
||
|
|
RH-Bugzilla: 1957194
|
||
|
|
RH-Acked-by: Stefano Garzarella <sgarzare@redhat.com>
|
||
|
|
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
RH-Acked-by: Igor Mammedov <imammedo@redhat.com>
|
||
|
|
RH-Acked-by: Andrew Jones <drjones@redhat.com>
|
||
|
|
|
||
|
|
Commit f61fe11aa6f broke hmp_loadvm() by adding an incorrect negation
|
||
|
|
when converting from 0/-errno return values to a bool value. The result
|
||
|
|
is that loadvm resumes the VM now if it failed and keeps it stopped if
|
||
|
|
it failed. Fix it to restore the old behaviour and do it the other way
|
||
|
|
around.
|
||
|
|
|
||
|
|
Fixes: f61fe11aa6f7f8f0ffe4ddaa56a8108f3ab57854
|
||
|
|
Cc: qemu-stable@nongnu.org
|
||
|
|
Reported-by: Yanhui Ma <yama@redhat.com>
|
||
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
Message-Id: <20210511163151.45167-1-kwolf@redhat.com>
|
||
|
|
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||
|
|
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
||
|
|
(cherry picked from commit c53cd04e70641fdf9410aac40c617d074047b3e1)
|
||
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
---
|
||
|
|
monitor/hmp-cmds.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c
|
||
|
|
index 0ad5b77477..cc15d9b6ee 100644
|
||
|
|
--- a/monitor/hmp-cmds.c
|
||
|
|
+++ b/monitor/hmp-cmds.c
|
||
|
|
@@ -1133,7 +1133,7 @@ void hmp_loadvm(Monitor *mon, const QDict *qdict)
|
||
|
|
|
||
|
|
vm_stop(RUN_STATE_RESTORE_VM);
|
||
|
|
|
||
|
|
- if (!load_snapshot(name, NULL, false, NULL, &err) && saved_vm_running) {
|
||
|
|
+ if (load_snapshot(name, NULL, false, NULL, &err) && saved_vm_running) {
|
||
|
|
vm_start();
|
||
|
|
}
|
||
|
|
hmp_handle_error(mon, err);
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|