From nobody Mon May 13 14:33:36 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 165157846149452.37997456612925; Tue, 3 May 2022 04:47:41 -0700 (PDT) Received: from localhost ([::1]:45762 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nlr0F-0003oS-LV for importer@patchew.org; Tue, 03 May 2022 07:47:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37728) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlqqf-0000UE-Px for qemu-devel@nongnu.org; Tue, 03 May 2022 07:37:45 -0400 Received: from smtp233.sjtu.edu.cn ([202.120.2.233]:36718) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlqqd-0001Z8-5k for qemu-devel@nongnu.org; Tue, 03 May 2022 07:37:45 -0400 Received: from proxy02.sjtu.edu.cn (smtp188.sjtu.edu.cn [202.120.2.188]) by smtp233.sjtu.edu.cn (Postfix) with ESMTPS id B2C7E1008CBC9; Tue, 3 May 2022 19:37:30 +0800 (CST) Received: from localhost (localhost.localdomain [127.0.0.1]) by proxy02.sjtu.edu.cn (Postfix) with ESMTP id 95013200B8933; Tue, 3 May 2022 19:37:30 +0800 (CST) Received: from proxy02.sjtu.edu.cn ([127.0.0.1]) by localhost (proxy02.sjtu.edu.cn [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id XX-CRjirJX1e; Tue, 3 May 2022 19:37:30 +0800 (CST) Received: from guozhi-ipads.ipads-lab.se.sjtu.edu.cn (unknown [202.120.40.82]) (Authenticated sender: qtxuning1999@sjtu.edu.cn) by proxy02.sjtu.edu.cn (Postfix) with ESMTPSA id 51940200B8926; Tue, 3 May 2022 19:37:27 +0800 (CST) X-Virus-Scanned: amavisd-new at From: Guo Zhi To: Paolo Bonzini Cc: Guo Zhi , qemu-devel@nongnu.org Subject: [PATCH v2] vga: avoid crash if no default vga card Date: Tue, 3 May 2022 19:37:24 +0800 Message-Id: <20220503113725.994885-1-qtxuning1999@sjtu.edu.cn> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=202.120.2.233; envelope-from=qtxuning1999@sjtu.edu.cn; helo=smtp233.sjtu.edu.cn X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_SORBS_WEB=1.5, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZM-MESSAGEID: 1651578464659100001 Content-Type: text/plain; charset="utf-8" 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 --- 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_cl= ass, const char *p) =20 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); --=20 2.35.1