From nobody Tue Feb 10 06:26:22 2026 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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 ARC-Seal: i=1; a=rsa-sha256; t=1585027249; cv=none; d=zohomail.com; s=zohoarc; b=oFV7e0Lnh3PKWppyUDC7ySaJBm/DZ5My9MUm4jiTV0U7UvSO62in7J3vdm+8f5OXWqeLPSmNurffEWM+QazLYAM9U98KCa0LtHyZ7ow4cTl1IpIQwNxcl9is2t2d7kXbD48L8bZAMWgClFlR4GPpyZtjVTIETJSnQ5WVNXmpCr4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585027249; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BW7q5z7qcX5tPfeXMStRdWMH62hd0rn8wfxGURAQHvw=; b=n60IzGkm2a/izYdevLoO1cB06fPVCVebKmGXTh4/qgzAP81oBNYmNWNBwwS9A9bJbPe13IiKoJSJsf79sZn4D7Tr8xi6JP6br8fK/cJrLNYmTQ375qvAjJ8/hHxJz4tTCkH3RKKpEvzkS4l3DXNJmXUpITNbnBOcp+zb2t6ekjI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 1585027249256797.8315231026438; Mon, 23 Mar 2020 22:20:49 -0700 (PDT) Received: from localhost ([::1]:42966 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGbzc-0002tr-3I for importer@patchew.org; Tue, 24 Mar 2020 01:20:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36936) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jGbu8-0004aA-64 for qemu-devel@nongnu.org; Tue, 24 Mar 2020 01:15:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jGbu7-0001eG-57 for qemu-devel@nongnu.org; Tue, 24 Mar 2020 01:15:08 -0400 Received: from ozlabs.org ([203.11.71.1]:52325) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jGbu6-0001c5-Q2; Tue, 24 Mar 2020 01:15:07 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 48mfZX09jrz9sSR; Tue, 24 Mar 2020 16:14:59 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1585026900; bh=jbBX3JoVk1S0mEuBSwAHT1Fs43s6s7XMQFv5jI4uPK4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hgNzn9UI6WKYuGFiGO/lzXf8rEBBYLkT8hUtrmmTBGNYy8K2FkXyRIq/9MjNuH9JP QavlbW+V6DDNcXYdUAWglOlLBtTY7ZGWbE8xQe1oeNY3BqFcEuXAvJd8V4fgdvQeFM ZQ4qCeoEN3XE5z1pXUzNDgFPPu/jSyK/GeO45QKM= From: David Gibson To: peter.maydell@linaro.org Subject: [PULL 7/7] ppc/ppc405_boards: Remove unnecessary NULL check Date: Tue, 24 Mar 2020 16:14:56 +1100 Message-Id: <20200324051456.256116-8-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200324051456.256116-1-david@gibson.dropbear.id.au> References: <20200324051456.256116-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 203.11.71.1 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: aik@ozlabs.ru, Markus Armbruster , qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, clg@kaod.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Philippe Mathieu-Daud=C3=A9 This code is inside the "if (dinfo)" condition, so testing again here whether it is NULL is unnecessary. Fixes: dd59bcae7 (Don't size flash memory to match backing image) Reported-by: Coverity (CID 1421917) Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200320155740.5342-1-philmd@redhat.com> Reviewed-by: Markus Armbruster Signed-off-by: David Gibson --- hw/ppc/ppc405_boards.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c index e6bffb9e1a..6198ec1035 100644 --- a/hw/ppc/ppc405_boards.c +++ b/hw/ppc/ppc405_boards.c @@ -191,7 +191,7 @@ static void ref405ep_init(MachineState *machine) bios_size =3D 8 * MiB; pflash_cfi02_register((uint32_t)(-bios_size), "ef405ep.bios", bios_size, - dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, + blk_by_legacy_dinfo(dinfo), 64 * KiB, 1, 2, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x= 2AA, 1); @@ -459,7 +459,7 @@ static void taihu_405ep_init(MachineState *machine) bios_size =3D 2 * MiB; pflash_cfi02_register(0xFFE00000, "taihu_405ep.bios", bios_size, - dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, + blk_by_legacy_dinfo(dinfo), 64 * KiB, 1, 4, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x= 2AA, 1); @@ -494,7 +494,7 @@ static void taihu_405ep_init(MachineState *machine) if (dinfo) { bios_size =3D 32 * MiB; pflash_cfi02_register(0xfc000000, "taihu_405ep.flash", bios_size, - dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, + blk_by_legacy_dinfo(dinfo), 64 * KiB, 1, 4, 0x0001, 0x22DA, 0x0000, 0x0000, 0x555, 0x= 2AA, 1); --=20 2.25.1