qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Cédric Le Goater" <clg@redhat.com>
Subject: [PULL 04/21] hw/pci-bridge: Add a Kconfig switch for the normal PCI bridge
Date: Mon, 21 Oct 2024 13:34:41 +0200	[thread overview]
Message-ID: <20241021113500.122500-5-thuth@redhat.com> (raw)
In-Reply-To: <20241021113500.122500-1-thuth@redhat.com>

The pci-bridge device is not usable on s390x, so introduce a Kconfig
switch that allows to disable it.

Message-ID: <20240913144844.427899-1-thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 hw/pci-bridge/Kconfig     | 5 +++++
 hw/pci-bridge/meson.build | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/hw/pci-bridge/Kconfig b/hw/pci-bridge/Kconfig
index 67077366cc..449ec98643 100644
--- a/hw/pci-bridge/Kconfig
+++ b/hw/pci-bridge/Kconfig
@@ -1,3 +1,8 @@
+config PCI_BRIDGE
+    bool
+    default y if PCI_DEVICES
+    depends on PCI
+
 config PCIE_PORT
     bool
     default y if PCI_DEVICES
diff --git a/hw/pci-bridge/meson.build b/hw/pci-bridge/meson.build
index f2a60434dd..2e0eb0d233 100644
--- a/hw/pci-bridge/meson.build
+++ b/hw/pci-bridge/meson.build
@@ -1,5 +1,5 @@
 pci_ss = ss.source_set()
-pci_ss.add(files('pci_bridge_dev.c'))
+pci_ss.add(when: 'CONFIG_PCI_BRIDGE', if_true: files('pci_bridge_dev.c'))
 pci_ss.add(when: 'CONFIG_I82801B11', if_true: files('i82801b11.c'))
 pci_ss.add(when: 'CONFIG_IOH3420', if_true: files('ioh3420.c'))
 pci_ss.add(when: 'CONFIG_PCIE_PORT', if_true: files('pcie_root_port.c', 'gen_pcie_root_port.c'))
-- 
2.47.0



  parent reply	other threads:[~2024-10-21 11:35 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-21 11:34 [PULL 00/21] Test updates (tuxrun tests, new QTest maintainer, ...) Thomas Huth
2024-10-21 11:34 ` [PULL 01/21] tests/vm: update openbsd image to 7.6 Thomas Huth
2024-10-21 11:34 ` [PULL 02/21] tests/qtest: Raise the ide-test timeout Thomas Huth
2024-10-21 11:34 ` [PULL 03/21] MAINTAINERS: A new maintainer for the qtests Thomas Huth
2024-10-21 11:34 ` Thomas Huth [this message]
2024-10-21 11:34 ` [PULL 05/21] tests/functional: Add a base class for the TuxRun tests Thomas Huth
2024-10-21 11:34 ` [PULL 06/21] tests/functional: Convert the Avocado ppc64 tuxrun tests Thomas Huth
2024-10-21 11:34 ` [PULL 07/21] tests/functional: Convert the Avocado aarch64 " Thomas Huth
2024-10-21 11:34 ` [PULL 08/21] tests/functional: Convert the Avocado sparc64 tuxrun test Thomas Huth
2024-10-21 11:34 ` [PULL 09/21] tests/functional: Convert the Avocado s390x " Thomas Huth
2024-10-21 11:34 ` [PULL 10/21] tests/functional: Convert the Avocado arm tuxrun tests Thomas Huth
2024-10-21 11:34 ` [PULL 11/21] tests/functional: Convert the Avocado riscv32 " Thomas Huth
2024-10-21 11:34 ` [PULL 12/21] tests/functional: Convert the Avocado riscv64 " Thomas Huth
2024-10-21 11:34 ` [PULL 13/21] tests/functional: Convert the Avocado i386 tuxrun test Thomas Huth
2024-10-21 11:34 ` [PULL 14/21] tests/functional: Convert the Avocado x86_64 " Thomas Huth
2024-10-21 11:34 ` [PULL 15/21] tests/functional: Convert the Avocado mips " Thomas Huth
2024-10-21 11:34 ` [PULL 16/21] tests/functional: Convert the Avocado mipsel " Thomas Huth
2024-10-21 11:34 ` [PULL 17/21] tests/functional: Convert the Avocado mips64 " Thomas Huth
2024-10-21 11:34 ` [PULL 18/21] tests/functional: Convert the Avocado mips64el " Thomas Huth
2024-10-21 11:34 ` [PULL 19/21] tests/functional: Convert the Avocado ppc32 " Thomas Huth
2024-10-21 11:34 ` [PULL 20/21] Revert "hw/sh4/r2d: Realize IDE controller before accessing it" Thomas Huth
2024-10-21 11:34 ` [PULL 21/21] tests/functional: Convert the Avocado sh4 tuxrun test Thomas Huth
2024-10-21 13:00 ` [PULL 00/21] Test updates (tuxrun tests, new QTest maintainer, ...) Peter Maydell
2024-10-21 13:18   ` Thomas Huth
2024-10-21 13:55     ` Thomas Huth
2024-10-21 13:59       ` Peter Maydell
2024-10-21 14:11         ` Thomas Huth
2024-10-21 15:39           ` Peter Maydell
2024-10-21 16:03             ` Thomas Huth

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20241021113500.122500-5-thuth@redhat.com \
    --to=thuth@redhat.com \
    --cc=clg@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).