7a16948063
- ppc/xive: Fix ESB length overflow on 32-bit hosts - target/hppa: Fix PSW V-bit packaging in cpu_hppa_get for hppa64 - target/ppc: Fix migration of CPUs with TLB_EMB TLB type - target/arm: Clear high SVE elements in handle_vec_simd_wshli - module: Prevent crash by resetting local_err in module_load_qom_all() - tests/docker: update debian i686 and mipsel images to bookworm - target/arm: Fix SVE SDOT/UDOT/USDOT (4-way, indexed) - docs/sphinx/depfile.py: Handle env.doc2path() returning a Path not a str - block/blkio: use FUA flag on write zeroes only if supported - virtio-pci: Fix the use of an uninitialized irqfd - hw/cxl: Ensure there is enough data to read the input header in cmd_get_physical_port_state() - intel_iommu: Send IQE event when setting reserved bit in IQT_TAIL - virtio-net: Avoid indirection_table_mask overflow - Fix calculation of minimum in colo_compare_tcp - target/riscv/csr.c: Fix an access to VXSAT - linux-user: Clean up unused header - raw-format: Fix error message for invalid offset/size - hw/loongarch/virt: Remove unnecessary 'cpu.h' inclusion - tests: Wait for migration completion on destination QEMU to avoid failures - acpi: ged: Add macro for acpi sleep control register - hw/intc/openpic: Improve errors for out of bounds property values - hw/pci-bridge: Add a Kconfig switch for the normal PCI bridge - docs/tools/qemu-img.rst: fix typo (sumarizes) - audio/pw: Report more accurate error when connecting to PipeWire fails - audio/pw: Report more accurate error when connecting to PipeWire fails - dma: Fix function names in documentation Ensure the function names match. - edu: fix DMA range upper bound check - platform-bus: fix refcount leak - hw/net/can/sja1000: fix bug for single acceptance filter and standard frame - tests/avocado: fix typo in replay_linux - util/userfaultfd: Remove unused uffd_poll_events - Consider discard option when writing zeros - crypto: factor out conversion of QAPI to gcrypt constants - crypto: drop gnutls debug logging support - crypto: use consistent error reporting pattern for unsupported cipher modes - hw/gpio/aspeed_gpio: Avoid shift into sign bit Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit b6e04df301d30895427ab41a1edff0f40149bdd9)
51 lines
1.7 KiB
Diff
51 lines
1.7 KiB
Diff
From 55ea1e473095ea5be692bb4ba2e44131a4a88e73 Mon Sep 17 00:00:00 2001
|
|
From: Zhang Jiao <zhangjiao2_yewu@cmss.chinamobile.com>
|
|
Date: Wed, 23 Oct 2024 13:40:51 +0800
|
|
Subject: [PATCH] hw/pci-bridge: Add a Kconfig switch for the normal PCI bridge
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
cheery-pick from e779e5c05ad5d8237e2a7d8ba8b432cd24c1708b
|
|
|
|
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>
|
|
Signed-off-by: Zhang Jiao <zhangjiao2_yewu@cmss.chinamobile.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 6d5ad9f37b..a8b88e9099 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.41.0.windows.1
|
|
|