qemu-trivial
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH v1] vga: avoid crash if no default vga card


From: Laurent Vivier
Subject: Re: [PATCH v1] vga: avoid crash if no default vga card
Date: Tue, 28 Jun 2022 10:48:04 +0200
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.10.0

Le 03/05/2022 à 17:39, Thomas Huth a écrit :
On 03/05/2022 11.17, Guo Zhi wrote:
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.

Signed-off-by: Guo Zhi <qtxuning1999@sjtu.edu.cn>
---
  softmmu/vl.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/softmmu/vl.c b/softmmu/vl.c
index c2919579fd..a49e29312b 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -977,7 +977,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);

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/978

Reviewed-by: Thomas Huth <thuth@redhat.com>
Tested-by: Thomas Huth <thuth@redhat.com>



Applied to my trivial-patches branch.

Thanks,
Laurent




reply via email to

[Prev in Thread] Current Thread [Next in Thread]