From patchwork Mon Mar 11 19:11:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1054816 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44J78w65cjz9s55 for ; Tue, 12 Mar 2019 06:15:12 +1100 (AEDT) Received: from localhost ([127.0.0.1]:38845 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3QOE-0007Zi-Pl for incoming@patchwork.ozlabs.org; Mon, 11 Mar 2019 15:15:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60223) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3QL8-0005Rc-UN for qemu-devel@nongnu.org; Mon, 11 Mar 2019 15:12:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3QL8-0003aJ-Al for qemu-devel@nongnu.org; Mon, 11 Mar 2019 15:11:58 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:46901) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3QL4-0003Uo-Du; Mon, 11 Mar 2019 15:11:54 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MkYkC-1gdPhl2LxW-00m6PW; Mon, 11 Mar 2019 20:11:39 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Mon, 11 Mar 2019 20:11:27 +0100 Message-Id: <20190311191128.30562-5-laurent@vivier.eu> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190311191128.30562-1-laurent@vivier.eu> References: <20190311191128.30562-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:ixxF0H+MoBCgnQiepnZhCOBCG3pviUjJCeH8j2JQGbKgx2eaGVl FfZZ2KOYE8VVbH8sg+C+7FX8I2yC3up0z/7IHObzUu2Mh8DAycUe5luCSvcSG4+Z8BBXdxI 4HRxvo+cZNwO87v0ztJAsXSKUZxKPbcIjEK6Sen3N4R3QSGfBrZ3+P9F8b2KfULVZoZDdY3 kaBt4sem+ldeMER1yac5w== X-UI-Out-Filterresults: notjunk:1; V03:K0:0mxlzMy3Pso=:LOy2L9wK+lq+U1aevPq0II N8rQyYujvQaOioGRaU35FCGPRpIPhkyaVwWJbvDfNb6QbQzsUjwxNhFb+hSby68y/gthN2ObO TskrqDDJupodKDhfCbMwcznFmpa88ecjL5WdFdKsdFUTkchIUQCuwtUNQzP02gA9UY0jlyuzB DF4uBnw/DUM8vknjm3T1sphTeGVHDfXu27o5Xca1gDRgolEhwkYp3PIIUlf37f4Uu29Txzvhk 3ADvMnvuIneTvLSsqTPTa+oRziJbqLZoYEJ7smP3n5x5V/nALydo8kntrStcauTlYuzZTqMuC T5R2X3p3bByV1mMv2mKao2MIm1Kuv9jjqsNcrcvQEvy8x5f0zqOvGPkQnT33MXxmlytSgjPC+ 9LtdL/Jr/wW9Knb6UZdxP53Sp/1Fdl4AkappQnENYP08h8Nt2EMjr4PYHsDUSXUOwM5+ugm07 +g6btYWQRgwxbRFKLcCF29kgAgx8/CTddnVuTo+mLoeXPwk4/sGDSh6rBN4KDulZ0Ljgzrlm+ fdrhY4/c4sXUAAj8G/ibjggCT8STomOpYZewczOaIizUfXN0b5MjOeFpL7+YmWyKNy/IBHCiO 6JucCkdfaeTkvUs59J9xmEVOI87k2M+dd12uHuhYAGicm6abOAD8Pz4uDgDtHOqtsgMqwzJVQ MosRjL9TyMSuxXZEjlEOqcUHopuO0+bNSmryX+dZC+hEE184ZCUifhpIL72qmJlXQJs1CY4vE osHY/1YYIffyo7RGl1gTMTvHERR149VKOyKz31R30+DED0KYHXUEZUG9Y8k= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 217.72.192.74 Subject: [Qemu-devel] [PULL 4/5] hw/arm/virt: Remove null-check in virt_build_smbios() 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: Peter Maydell , "Michael S. Tsirkin" , qemu-trivial@nongnu.org, =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , Riku Voipio , Michael Tokarev , Laurent Vivier , Markus Armbruster , qemu-arm@nongnu.org, Gerd Hoffmann , Igor Mammedov , Paolo Bonzini , Laszlo Ersek Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé 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é Message-Id: <20190309181920.30553-2-philmd@redhat.com> Signed-off-by: Laurent Vivier --- hw/arm/virt.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 7f66ddad89f6..377e95a4cdb0 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1281,10 +1281,6 @@ static void virt_build_smbios(VirtMachineState *vms) size_t smbios_tables_len, smbios_anchor_len; const char *product = "QEMU Virtual Machine"; - if (!vms->fw_cfg) { - return; - } - if (kvm_enabled()) { product = "KVM Virtual Machine"; }