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
42 lines
1.4 KiB
Diff
42 lines
1.4 KiB
Diff
From: Zhenzhong Duan <zhenzhong.duan@intel.com>
|
|
Date: Thu, 10 Jun 2021 16:47:41 +0800
|
|
Subject: vl: Fix an assert failure in error path
|
|
|
|
Git-commit: 38f71349c7c4969bc14da4da1c70b8cc4078d596
|
|
|
|
Based on the description of error_setg(), the local variable err in
|
|
qemu_maybe_daemonize() should be initialized to NULL.
|
|
|
|
Without fix, the uninitialized *errp triggers assert failure which
|
|
doesn't show much valuable information.
|
|
|
|
Before the fix:
|
|
qemu-system-x86_64: ../util/error.c:59: error_setv: Assertion `*errp == NULL' failed.
|
|
|
|
After fix:
|
|
qemu-system-x86_64: cannot create PID file: Cannot open pid file: Permission denied
|
|
|
|
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
|
|
Message-Id: <20210610084741.456260-1-zhenzhong.duan@intel.com>
|
|
Cc: qemu-stable@nongnu.org
|
|
Fixes: 0546c0609c ("vl: split various early command line options to a separate function", 2020-12-10)
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
Signed-off-by: Jose R. Ziviani <jziviani@suse.de>
|
|
---
|
|
softmmu/vl.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/softmmu/vl.c b/softmmu/vl.c
|
|
index 8cb68f21b9f2a5cf159295169ed0..8a0ab39d81b1108826526bf3fc9a 100644
|
|
--- a/softmmu/vl.c
|
|
+++ b/softmmu/vl.c
|
|
@@ -2509,7 +2509,7 @@ static void qemu_process_help_options(void)
|
|
|
|
static void qemu_maybe_daemonize(const char *pid_file)
|
|
{
|
|
- Error *err;
|
|
+ Error *err = NULL;
|
|
|
|
os_daemonize();
|
|
rcu_disable_atfork();
|