From nobody Sun May 19 03:54:32 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553007073472991.8018119420091; Tue, 19 Mar 2019 07:51:13 -0700 (PDT) Received: from localhost ([127.0.0.1]:58500 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6G57-0007rt-I2 for importer@patchew.org; Tue, 19 Mar 2019 10:51:09 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35881) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h6FvL-0002Sc-Vc for qemu-devel@nongnu.org; Tue, 19 Mar 2019 10:41:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h6FvK-0005ba-Gg for qemu-devel@nongnu.org; Tue, 19 Mar 2019 10:41:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48896) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h6FvJ-0005Yk-QJ for qemu-devel@nongnu.org; Tue, 19 Mar 2019 10:41:02 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F236730E92F3; Tue, 19 Mar 2019 14:41:00 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-112-24.ams2.redhat.com [10.36.112.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 469931024940; Tue, 19 Mar 2019 14:40:54 +0000 (UTC) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 19 Mar 2019 15:40:13 +0100 Message-Id: <20190319144013.26584-2-pbonzini@redhat.com> In-Reply-To: <20190319144013.26584-1-pbonzini@redhat.com> References: <20190319144013.26584-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Tue, 19 Mar 2019 14:41:01 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] sun4m: obey -vga none X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Cave-Ayland , philmd@redhat.com, Artyom Tarasenko Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Do not create a TCX if "-vga none" was passed on the command line. Remove some dead code along the way to avoid big reindentation. Signed-off-by: Paolo Bonzini Reviewed-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- hw/sparc/sun4m.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index ca1e3825d5..07d126aea8 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -850,7 +850,6 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwd= ef, uint32_t initrd_size; DriveInfo *fd[MAX_FD]; FWCfgState *fw_cfg; - unsigned int num_vsimms; DeviceState *dev; SysBusDevice *s; =20 @@ -909,8 +908,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwd= ef, error_report("Unsupported depth: %d", graphic_depth); exit (1); } - num_vsimms =3D 0; - if (num_vsimms =3D=3D 0) { + if (vga_interface_type !=3D VGA_NONE) { if (vga_interface_type =3D=3D VGA_CG3) { if (graphic_depth !=3D 8) { error_report("Unsupported depth: %d", graphic_depth); @@ -945,7 +943,7 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwd= ef, } } =20 - for (i =3D num_vsimms; i < MAX_VSIMMS; i++) { + for (i =3D 0; i < MAX_VSIMMS; i++) { /* vsimm registers probed by OBP */ if (hwdef->vsimm[i].reg_base) { empty_slot_init(hwdef->vsimm[i].reg_base, 0x2000); --=20 2.20.1