eb86ba78e5
- Fix stable issues found in upstream: hmp-Fix-loadvm-to-resume-the-VM-on-succe.patch hw-block-nvme-align-with-existing-style.patch hw-nvme-fix-missing-check-for-PMR-capabi.patch hw-nvme-fix-pin-based-interrupt-behavior.patch linux-user-aarch64-Enable-hwcap-for-RND-.patch qemu-config-load-modules-when-instantiat.patch qemu-config-parse-configuration-files-to.patch qemu-config-use-qemu_opts_from_qdict.patch runstate-Initialize-Error-to-NULL.patch target-i386-Exit-tb-after-wrmsr.patch tcg-Allocate-sufficient-storage-in-temp_.patch tcg-sparc-Fix-temp_allocate_frame-vs-spa.patch vhost-vdpa-don-t-initialize-backend_feat.patch vl-allow-not-specifying-size-in-m-when-u.patch vl-Fix-an-assert-failure-in-error-path.patch vl-plug-object-back-into-readconfig.patch vl-plumb-keyval-based-options-into-readc.patch x86-acpi-use-offset-instead-of-pointer-w.patch - Update qemu-supportconfig plugin - Fix an update-alternative warning when removing qemu-skiboot package bsc#1178678 OBS-URL: https://build.opensuse.org/request/show/903710 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=660
38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
From: Kevin Wolf <kwolf@redhat.com>
|
|
Date: Tue, 11 May 2021 18:31:51 +0200
|
|
Subject: hmp: Fix loadvm to resume the VM on success instead of failure
|
|
|
|
Git-commit: c53cd04e70641fdf9410aac40c617d074047b3e1
|
|
|
|
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>
|
|
Signed-off-by: Jose R. Ziviani <jziviani@suse.de>
|
|
---
|
|
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 0ad5b774778d4634e8b506881d3f..cc15d9b6ee32264406c890b83866 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);
|