From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1h2gZZ-0001Ab-2u for mharc-qemu-trivial@gnu.org; Sat, 09 Mar 2019 13:19:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53144) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2gZV-000170-US for qemu-trivial@nongnu.org; Sat, 09 Mar 2019 13:19:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2gZU-0004G2-9Z for qemu-trivial@nongnu.org; Sat, 09 Mar 2019 13:19:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60178) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h2gZK-00049F-3K; Sat, 09 Mar 2019 13:19:34 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 59613C057E68; Sat, 9 Mar 2019 18:19:33 +0000 (UTC) Received: from x1w.redhat.com (ovpn-204-28.brq.redhat.com [10.40.204.28]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AB28060A9F; Sat, 9 Mar 2019 18:19:30 +0000 (UTC) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-trivial@nongnu.org, qemu-devel@nongnu.org Cc: Laurent Vivier , Laszlo Ersek , Peter Maydell , Michael Tokarev , Gerd Hoffmann , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, Markus Armbruster Date: Sat, 9 Mar 2019 19:19:19 +0100 Message-Id: <20190309181920.30553-2-philmd@redhat.com> In-Reply-To: <20190309181920.30553-1-philmd@redhat.com> References: <20190309181920.30553-1-philmd@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Sat, 09 Mar 2019 18:19:33 +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-trivial] [PATCH v3 1/2] hw/arm/virt: Remove null-check in virt_build_smbios() X-BeenThere: qemu-trivial@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 09 Mar 2019 18:19:48 -0000 Since commit 578f3c7b0835 ("arm: add fw_cfg to "virt" board", 2014-12-22), the machvirt_init() unconditionally creates the fw_cfg object. Later, commit c30e15658b1b ("smbios: implement smbios support for mach-virt", 2015-09-07) added a superfluous null-check on it. Remove this superfluous check. Reviewed-by: Laszlo Ersek Reviewed-by: Markus Armbruster Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v2: Corrected commit reference (Laszlo) v3: Dropped 'Fixes:' (Markus) --- hw/arm/virt.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 7f66ddad89..377e95a4cd 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1281,10 +1281,6 @@ static void virt_build_smbios(VirtMachineState *vm= s) size_t smbios_tables_len, smbios_anchor_len; const char *product =3D "QEMU Virtual Machine"; =20 - if (!vms->fw_cfg) { - return; - } - if (kvm_enabled()) { product =3D "KVM Virtual Machine"; } --=20 2.20.1