7bb77ea74f
- Introduce the SM4 cipher algorithms (OSCCA GB/T 32907-2016).
- intel_iommu: Add missed sanity check for 256-bit invalidation queue
- linux-user: use 'max' instead of 'qemu32' / 'qemu64' by default
- chardev/baum: Use definitions to avoid dynamic stack allocation
- ui/console: Get tab completion working again in the SDL monitor vc
- s390x/tcg: Fix opcode for lzrf
- virtiofsd: use g_date_time_get_microsecond to get subsecond
- ui/curses: Avoid dynamic stack allocation
- target/m68k: always call gen_exit_tb() after writes to SR
- target/m68k: Perform writback before modifying SR
- target/m68k: Fix MACSR to CCR
- target/m68k: Implement atomic test-and-set
- block/nvme: nvme_process_completion() fix bound for cid
- hw/pci-host: pnv_phb{3, 4}: Fix heap out-of-bound access failure
- target/ppc: Zero second doubleword of VSR registers for FPR insns
- target/ppc: Set OV32 when OV is set
- target/ppc: Zero second doubleword for VSX madd instructions
- target/ppc: Set result to QNaN for DENBCD when VXCVI occurs
- hw/pci: Add parenthesis to PCI_BUILD_BDF macro
- intel_iommu: Send IQE event when setting reserved bit in IQT_TAIL
- acpi: cpuhp: fix guest-visible maximum access size to the legacy reg block
- acpi: ged: Add macro for acpi sleep control register
- hw/pci-bridge: Add a Kconfig switch for the normal PCI bridge
- ui/vnc: fix handling of VNC_FEATURE_XVP
- s390/sclp: fix SCLP facility map
- docs/tools/qemu-img.rst: fix typo (sumarizes)
- chardev/char: fix qemu_chr_is_busy() check
- edu: fix DMA range upper bound check
- platform-bus: fix refcount leak
- hw/net/virtio-net: fix qemu set used ring flag even vhost started
- 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
- hw/core/ptimer: fix timer zero period condition for freq > 1GHz
- hcd-ohci: Drop ohci_service_iso_td() if ed->head & OHCI_DPTR_MASK is zero
- tests/unit/test-vmstate: Avoid dynamic stack allocation
- hw/usb/hcd-ohci: Use definition to avoid dynamic stack allocation
- hw/i386/multiboot: Avoid dynamic stack allocation
- hw/ppc/spapr: Fix code style problems reported by checkpatch
- chardev/baum: Replace magic values by X_MAX / Y_MAX definitions
- hw/intc/xics: Avoid dynamic stack allocation
- hw/net/e1000e_core: Use definition to avoid dynamic stack allocation
- intel_iommu: Fix invalidation descriptor type field
- configs: Fix typo in the sh4-softmmu devices config file
Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
(cherry picked from commit 9813ed21ec2499c50cb58ac5fb114a1641708eb2)
51 lines
1.8 KiB
Diff
51 lines
1.8 KiB
Diff
From 44ed577fd7c8ecf487157658e3d54cbfccb30ec2 Mon Sep 17 00:00:00 2001
|
|
From: Zhang Jiao <zhangjiao2_yewu@cmss.chinamobile.com>
|
|
Date: Wed, 23 Oct 2024 14:02:47 +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 f8df4315ba..d87b96e8bc 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 daab8acf2a..a48a6b9653 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', 'pcie_pci_bridge.c'))
|
|
--
|
|
2.41.0.windows.1
|
|
|