From nobody Sun Sep 28 17:05:16 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1756819257; cv=none; d=zohomail.com; s=zohoarc; b=a5wmLWmg2Q620Ri0mKcl8DHi1yoR9p5kodA3YWOJy1TPa4DO2iJpsmkklsuFa5ibgA4SXnSmyKvPl6FgZyfUkHl+ybP8Nwu4t/lzkRAVYvA69qVvehd8tCIfViqUenVOIFgG+H6pinfn/6DDQ9eiWOYvnWHtY3YCidHnaFP/v2Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756819257; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=IiaqMhKzb+hmnzQCD7wPPRZkhh4jutFo9MeWh47ViIw=; b=XU8rdSx1/15xksC0p8Yl85yTwAyQQUO8BkcXjUUI4mj8RY4pIqRdZoAfpkNmqGp4m0jEvVY8CGxEtY8R6i+tJKpA4o897Y43IfZlwvsHXN3S1MUoeo4ub1e404U5Fz5jPm/cPDGSZAWcEpsxTn3UYsGOy4LVXldwMy4o7byrnGw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1756819257134739.7866007994121; Tue, 2 Sep 2025 06:20:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utQps-0007yR-FZ; Tue, 02 Sep 2025 09:14:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1utQpC-0007IV-NB for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:13:29 -0400 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1utQp7-0004nO-Vs for qemu-devel@nongnu.org; Tue, 02 Sep 2025 09:13:25 -0400 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-45b8b8d45b3so20465855e9.1 for ; Tue, 02 Sep 2025 06:13:21 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-45b732671b7sm138309095e9.3.2025.09.02.06.13.17 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 02 Sep 2025 06:13:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756818798; x=1757423598; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=IiaqMhKzb+hmnzQCD7wPPRZkhh4jutFo9MeWh47ViIw=; b=T04mcPkO2zL7IqMK/1Wru2Oo8UKe8xsXkOQjbsGS9nVbmuTvJwpgJPOXf96gJBD3ym tkyeWgwqM6attKcel0rtxPlQPSQR4nFVgcqvDFvDMl8UVvVgtVCvaDjBf/djXEseAR57 QeZxIikQMhldsMWWV3Ukv+X6wDvY3UIeCFn8nbSXe22I4hYetOdHc8MWyO1R5r8nXfQJ lxGvd9/vpGmM7uX7R3mP9R+Sv9CD07bIcxS1ckSUWNp8zJmvQjkJlWqZwf8VHz1bOYQY frlKWP5gsJVaCz6omXwkJ9gEisXsJmWswv3jZod2U1KXewehgssn6DeQnpWJ+/ys40Bc GtwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756818798; x=1757423598; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IiaqMhKzb+hmnzQCD7wPPRZkhh4jutFo9MeWh47ViIw=; b=KxWCAuKy2p5gxks3p2OQAdR6Q3y1S+fy92scX9+t6asWLTGuJ1fageMVw21VZpf72s fjVeIOpNq19hMa6+LrFh0Rq2sbebZxBIivG0UGK3QQfbPbMpOrBO/oMvP3tzOSvsGgw0 xv+Mz8GVNNxz46VXjzXeU25WFWIDkIBP4JFtNuF5BBdvKimKKhaKtZNWwzSbo78yw84n vh69sHJpFFsLdgPlCBCnXtI+83qN7jhpLdwTWW9PZl3tq+RgItsOPKEpF8zcJaXyEYkp I4UEPnpcb/bYJRnBA0JtMLST+G8rH9aJcXCW9VH2E/CV3yVFpghuQjpIl+rGf5fW+QOH OOkw== X-Gm-Message-State: AOJu0YxGkRDBJntoOWP0OuUwUdpQbaDP+CymfrMWiE9Iy+z8xE5izDbx rq45OF4cB4E28FeA8RYt63MTM7xqYP2FX83Wjsy5Y68TzfgASPz1FdjiE8z23pqSCbXW7VXbNPi jkzMI X-Gm-Gg: ASbGncu4tRhnH7a7drWzjstWI/v6Dv03sAeOfAcPH9TOSsdzgZyoWto3VKH3lu12HVA KtB9dRuM3ujT2jJIVNE6HH0fy/wPAT0ARYj1+BkL8r2bb0RKWmIwjTckxDkJuUa4vXggcFHU/+h vTpb9/RQTi0BGPyFh2c5w5KtcM23BVUL5GeOr8JEVkg7xCpcE6UfiYhUP2qyYjnIWnspPCrKt/w 6qTzpcL5S4HaOwmgJR9NPf4G/PuoklBz7gsKC9RUNSiIqeUWw6pAGZ44oJciNosJInWpzU4yWEp hzzu27NQwGupNAc3R9FjmNToX0P5fOOD0lt9Y0Ntxdhwnsl6W+2JYPx2LroeiTJZ3L2Krmi1OSD y4TTZGmsXSkSjQS5V6tZPD1LVn1c36sWmfkB7nQUhTzdKn06aj81r5KBFSa4CSwjMe5NrifkL0d AwMG4s8cU= X-Google-Smtp-Source: AGHT+IHuKyd7Gr32qW6rTX74DYVdWJ4mz5v3D3N6BiYWZ7vIQkHvuGZDBDaOM6KaDdDfe0KYsWUJew== X-Received: by 2002:a05:600c:1ca8:b0:45b:90fc:1ede with SMTP id 5b1f17b1804b1-45b90fc20bemr36418755e9.6.1756818798253; Tue, 02 Sep 2025 06:13:18 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 39/39] hw/i386/pc_piix.c: remove unnecessary if() from pc_init1() Date: Tue, 2 Sep 2025 15:10:16 +0200 Message-ID: <20250902131016.84968-40-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250902131016.84968-1-philmd@linaro.org> References: <20250902131016.84968-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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=2a00:1450:4864:20::333; envelope-from=philmd@linaro.org; helo=mail-wm1-x333.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1756819258552124100 From: Mark Cave-Ayland Now that the isapc logic has been split out of pc_piix.c, the PCI Host Brid= ge (phb) object is now always set in pc_init1(). Since phb is now guaranteed not to be NULL, Coverity reports that the if() statement surrounding ioapic_init_gsi() is now unnecessary and can be remov= ed along with the phb NULL initialiser. Coverity: CID 1620557 Signed-off-by: Mark Cave-Ayland Fixes: 99d0630a45 ("hw/i386/pc_piix.c: assume pcmc->pci_enabled is always t= rue in pc_init1()") Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-ID: <20250901203409.1196620-1-mark.caveayland@nutanix.com> Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/i386/pc_piix.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index 7e78b6daa6d..caf8bab68e2 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -106,7 +106,7 @@ static void pc_init1(MachineState *machine, const char = *pci_type) X86MachineState *x86ms =3D X86_MACHINE(machine); MemoryRegion *system_memory =3D get_system_memory(); MemoryRegion *system_io =3D get_system_io(); - Object *phb =3D NULL; + Object *phb; ISABus *isa_bus; Object *piix4_pm =3D NULL; qemu_irq smi_irq; @@ -284,9 +284,7 @@ static void pc_init1(MachineState *machine, const char = *pci_type) pc_i8259_create(isa_bus, gsi_state->i8259_irq); } =20 - if (phb) { - ioapic_init_gsi(gsi_state, phb); - } + ioapic_init_gsi(gsi_state, phb); =20 if (tcg_enabled()) { x86_register_ferr_irq(x86ms->gsi[13]); --=20 2.51.0