From nobody Fri Nov 14 21:07: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=quarantine dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1761599887; cv=none; d=zohomail.com; s=zohoarc; b=Uc/SSvPwTEaRgODDB+pCnM9oh8wbjOQFVlWjtPPdd4vQlxkA5ic46jOypMe8jN+5iLreFdtG4Mv7v5I2B1EDARppyY9A8xnqe/JIE4pfdMa7q+8fsfLMHZZpC1BDcl/0EaIBW2R5omCNE0GklQMs0BVKr78PI1kKSIgrrpxcdlg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761599887; h=Content-Type:Content-Transfer-Encoding:Cc:Cc: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; bh=hD3ue2f1Uvmb7sJuSw4rnO4mJ6hePxTgICZlQs+11hw=; b=a1h2hs5Eo4Y4n2DifsWTYpL7BPNOgIMzB8m+W9Cf5aFM/qzM9gHS5vzhA6mK0+VwVrPJXVwARnKcUOXj80Ww2detn0ZhrSXswKIZ+c2pQ6K/t0GdnhoXZq7gFwoq0sQgLLiDvgKlG66sydhmSkP8YpQYNB4vgjTp/6jFkyjX878= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17615998875713.356283531440795; Mon, 27 Oct 2025 14:18:07 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDUag-0002aq-A6; Mon, 27 Oct 2025 17:17:22 -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 1vDUZx-0002Uo-8q for qemu-devel@nongnu.org; Mon, 27 Oct 2025 17:16:48 -0400 Received: from tor.source.kernel.org ([2600:3c04:e001:324:0:1991:8:25]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vDUZr-00050z-Vx for qemu-devel@nongnu.org; Mon, 27 Oct 2025 17:16:36 -0400 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by tor.source.kernel.org (Postfix) with ESMTP id 5FF41620C4; Mon, 27 Oct 2025 21:16:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 510F7C4CEF1; Mon, 27 Oct 2025 21:16:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1761599788; bh=+GhzTgilJrazmWbh75bvGEDpXtSwiYUhbOKItG96eAM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k/GHOdWVigYE7Ppo913wh0oh8dvi4C8emqEZpOw2qeMphzOmoHvhuq3FrHXIK/syp lro2fZ6pY5I20xLzgNuqmfPU8H/koMKXyxj6didOd/kujAMlxoI6UJCHj5/HQV5/Gv VvRmdekPvlmFgXj0wz8FZh+uD6Wlm+HeRDejnok/RXM3828Wkm5p+1TDBr4Li8h2gG hJUfjqq7JYpgbw/gQcumRjk+WtBsFvHzcM80G2/IuCghez6hm3/lHVKCN5/7NyAIs2 VjqsHn31LtoFng9XCjd4OPrEvDESXcfiPuKrsbv1qJCljm75rtBUwN/FyVbdjcSHgl 3tRgbtX1IQibg== From: deller@kernel.org To: Richard Henderson , qemu-devel@nongnu.org, Peter Maydell Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Fam Zheng , Soumyajyotii Ssarkar , Paolo Bonzini , deller@gmx.de Subject: [PULL 09/11] hw/hppa: PCI devices depend on availability of PCI bus Date: Mon, 27 Oct 2025 22:16:01 +0100 Message-ID: <20251027211603.7141-10-deller@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251027211603.7141-1-deller@kernel.org> References: <20251027211603.7141-1-deller@kernel.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=2600:3c04:e001:324:0:1991:8:25; envelope-from=deller@kernel.org; helo=tor.source.kernel.org 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, 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 @kernel.org) X-ZM-MESSAGEID: 1761599891188154100 From: Helge Deller Only create the PCI serial ports (DIVA) and PCI network cards when there is actually a PCI bus. The shortly added 715 machine will not have a PCI bus, = so avoid creating further PCI devices. Signed-off-by: Helge Deller Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson --- hw/hppa/machine.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/hw/hppa/machine.c b/hw/hppa/machine.c index bec5a86f24..31eeba72b4 100644 --- a/hw/hppa/machine.c +++ b/hw/hppa/machine.c @@ -387,20 +387,22 @@ static void machine_HP_common_init_tail(MachineState = *machine, PCIBus *pci_bus, enable_lasi_lan()); } =20 - pci_init_nic_devices(pci_bus, mc->default_nic); - - /* BMC board: HP Diva GSP */ - dev =3D qdev_new("diva-gsp"); - if (!object_property_get_bool(OBJECT(dev), "disable", NULL)) { - pci_dev =3D pci_new_multifunction(PCI_DEVFN(2, 0), "diva-gsp"); - if (!lasi_dev) { - /* bind default keyboard/serial to Diva card */ - qdev_prop_set_chr(DEVICE(pci_dev), "chardev1", serial_hd(0)); - qdev_prop_set_chr(DEVICE(pci_dev), "chardev2", serial_hd(1)); - qdev_prop_set_chr(DEVICE(pci_dev), "chardev3", serial_hd(2)); - qdev_prop_set_chr(DEVICE(pci_dev), "chardev4", serial_hd(3)); + if (pci_bus) { + pci_init_nic_devices(pci_bus, mc->default_nic); + + /* BMC board: HP Diva GSP PCI card */ + dev =3D qdev_new("diva-gsp"); + if (dev && !object_property_get_bool(OBJECT(dev), "disable", NULL)= ) { + pci_dev =3D pci_new_multifunction(PCI_DEVFN(2, 0), "diva-gsp"); + if (!lasi_dev) { + /* bind default keyboard/serial to Diva card */ + qdev_prop_set_chr(DEVICE(pci_dev), "chardev1", serial_hd(0= )); + qdev_prop_set_chr(DEVICE(pci_dev), "chardev2", serial_hd(1= )); + qdev_prop_set_chr(DEVICE(pci_dev), "chardev3", serial_hd(2= )); + qdev_prop_set_chr(DEVICE(pci_dev), "chardev4", serial_hd(3= )); + } + pci_realize_and_unref(pci_dev, pci_bus, &error_fatal); } - pci_realize_and_unref(pci_dev, pci_bus, &error_fatal); } =20 /* create USB OHCI controller for USB keyboard & mouse on Astro machin= es */ --=20 2.51.0