PR#23: qemu-6.2.0-13 - rpms/qemu - src.fedoraproject.org

Mauro Matteo Cascella • 2 years ago

52368ef

file added

+33

		`@@ -0,0 +1,33 @@`
		`+ From 566b076ecb63a2ec0db5215770120314ce97c1cd Mon Sep 17 00:00:00 2001`
		`+ From: Guo Zhi <qtxuning1999@sjtu.edu.cn>`
		`+ Date: Tue, 3 May 2022 17:17:24 +0800`
		`+ Subject: [PATCH] vga: avoid crash if no default vga card`
		`+`
		`+ QEMU in some arch will crash when executing -vga help command, because`
		`+ there is no default vga model. Add check to this case and avoid crash.`
		`+`
		`+ Resolves: https://gitlab.com/qemu-project/qemu/-/issues/978`
		`+`
		`+ Signed-off-by: Guo Zhi <qtxuning1999@sjtu.edu.cn>`
		`+ Reviewed-by: Thomas Huth <thuth@redhat.com>`
		`+ Tested-by: Thomas Huth <thuth@redhat.com>`
		`+ Message-Id: <20220503091724.970009-1-qtxuning1999@sjtu.edu.cn>`
		`+ Signed-off-by: Laurent Vivier <laurent@vivier.eu>`
		`+ ---`
		`+ softmmu/vl.c \| 3 ++-`
		`+ 1 file changed, 2 insertions(+), 1 deletion(-)`
		`+`
		`+ diff --git a/softmmu/vl.c b/softmmu/vl.c`
		`+ index 620a1f1367..c945406cda 100644`
		`+ --- a/softmmu/vl.c`
		`+ +++ b/softmmu/vl.c`
		`+ @@ -970,7 +970,8 @@ static void select_vgahw(const MachineClass machine_class, const char p)`
		`+`
		`+ if (vga_interface_available(t) && ti->opt_name) {`
		`+ printf("%-20s %s%s\n", ti->opt_name, ti->name ?: "",`
		`+ - g_str_equal(ti->opt_name, def) ? " (default)" : "");`
		`+ + (def && g_str_equal(ti->opt_name, def)) ?`
		`+ + " (default)" : "");`
		`+ }`
		`+ }`
		`+ exit(0);`

qemu.spec

file modified

+8 -1

		`@@ -306,7 +306,7 @@`
		`%endif`

		`# To prevent rpmdev-bumpspec breakage`
		`- %global baserelease 12`
		`+ %global baserelease 13`

		`Summary: QEMU is a FAST! processor emulator`
		`Name: qemu`
		`@@ -358,6 +358,9 @@`
		`Patch0015: 0015-hw-i386-amd_iommu-Fix-maybe-uninitialized-error-with.patch`
		`Patch0016: 0016-Update-bios-table-test-blobs-after-bugfix-backports.patch`

		`+ # vga: avoid crash if no default vga card`
		`+ # https://gitlab.com/qemu-project/qemu/-/issues/978`
		`+ Patch0017: 0017-vga-avoid-crash-if-no-default-vga-card.patch`

		`BuildRequires: meson >= %{meson_version}`
		`BuildRequires: zlib-devel`
		`@@ -2686,6 +2689,10 @@`


		`%changelog`
		`+ * Fri Aug 5 2022 Mauro Matteo Cascella <mcascell@redhat.com> - 2:6.2.0-13`
		`+ - vga: avoid crash if no default vga card`
		`+ - Resolves: https://gitlab.com/qemu-project/qemu/-/issues/978`
		`+`
		`* Sat Jun 11 2022 Cole Robinson <crobinso@redhat.com> - 2:6.2.0-12`
		`- Adjust for Xen dropping 32bit arches`