[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 01/11] vga: avoid crash if no default vga card
From: |
Laurent Vivier |
Subject: |
[PULL 01/11] vga: avoid crash if no default vga card |
Date: |
Wed, 29 Jun 2022 11:08:39 +0200 |
From: Guo Zhi <qtxuning1999@sjtu.edu.cn>
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 b24772841db3..3f264d4b0930 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -981,7 +981,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);
--
2.36.1
- [PULL 00/11] Trivial branch for 7.1 patches, Laurent Vivier, 2022/06/29
- [PULL 07/11] hw/pci-host/i440fx: Remove unused parameter from i440fx_init(), Laurent Vivier, 2022/06/29
- [PULL 06/11] MAINTAINERS: Add softmmu/runstate.c to "Main loop", Laurent Vivier, 2022/06/29
- [PULL 03/11] util: Return void on iova_tree_remove, Laurent Vivier, 2022/06/29
- [PULL 01/11] vga: avoid crash if no default vga card,
Laurent Vivier <=
- [PULL 11/11] hw/i386/xen/xen-hvm: Inline xen_piix_pci_write_config_client() and remove it, Laurent Vivier, 2022/06/29
- [PULL 04/11] Trivial: 3 char repeat typos, Laurent Vivier, 2022/06/29
- [PULL 09/11] hw/ide/atapi.c: Correct typos (CD-CDROM -> CD-ROM), Laurent Vivier, 2022/06/29
- [PULL 02/11] qom/object: Remove circular include dependency, Laurent Vivier, 2022/06/29
- [PULL 05/11] trivial typos: namesapce, Laurent Vivier, 2022/06/29
- [PULL 10/11] hw/i386/xen/xen-hvm: Allow for stubbing xen_set_pci_link_route(), Laurent Vivier, 2022/06/29
- [PULL 08/11] common-user: Only compile the common user code if have_user is set, Laurent Vivier, 2022/06/29
- Re: [PULL 00/11] Trivial branch for 7.1 patches, Richard Henderson, 2022/06/29