[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 60/67] pxb: Restrict to x86
From: |
David Gibson |
Subject: |
[Qemu-devel] [PULL 60/67] pxb: Restrict to x86 |
Date: |
Thu, 12 Jan 2017 13:03:20 +1100 |
The PCI Expander Bridge (PXB) device is essentially a hack to allow
different PCIe devices to be assigned to different NUMA nodes on x86. Each
PXB is sort-of a separate PCI host bridge, except that its config space
is shared with the config space of the main PCI host bridge, rather than
being independent.
This is only necessary if the platform doesn't (easily) allow truly
independent PCI host bridges. AFAIK that's just x86.
This patch makes it possible to configure PXB out of the build, and adjusts
the default configs so it's only included on x86 targets.
Signed-off-by: David Gibson <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
---
default-configs/i386-softmmu.mak | 1 +
default-configs/x86_64-softmmu.mak | 1 +
hw/pci-bridge/Makefile.objs | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 0b51360..6c52d26 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -56,3 +56,4 @@ CONFIG_IOH3420=y
CONFIG_I82801B11=y
CONFIG_SMBIOS=y
CONFIG_HYPERV_TESTDEV=$(CONFIG_KVM)
+CONFIG_PXB=y
diff --git a/default-configs/x86_64-softmmu.mak
b/default-configs/x86_64-softmmu.mak
index 7f89503..2d0341c 100644
--- a/default-configs/x86_64-softmmu.mak
+++ b/default-configs/x86_64-softmmu.mak
@@ -56,3 +56,4 @@ CONFIG_IOH3420=y
CONFIG_I82801B11=y
CONFIG_SMBIOS=y
CONFIG_HYPERV_TESTDEV=$(CONFIG_KVM)
+CONFIG_PXB=y
diff --git a/hw/pci-bridge/Makefile.objs b/hw/pci-bridge/Makefile.objs
index f2adfe3..5612bd7 100644
--- a/hw/pci-bridge/Makefile.objs
+++ b/hw/pci-bridge/Makefile.objs
@@ -1,5 +1,5 @@
common-obj-y += pci_bridge_dev.o
-common-obj-y += pci_expander_bridge.o
+common-obj-$(CONFIG_PXB) += pci_expander_bridge.o
common-obj-$(CONFIG_XIO3130) += xio3130_upstream.o xio3130_downstream.o
common-obj-$(CONFIG_IOH3420) += ioh3420.o
common-obj-$(CONFIG_I82801B11) += i82801b11.o
--
2.9.3
- [Qemu-devel] [PULL 30/67] target-ppc: implement stxvll instructions, (continued)
- [Qemu-devel] [PULL 30/67] target-ppc: implement stxvll instructions, David Gibson, 2017/01/11
- [Qemu-devel] [PULL 32/67] prep: do not use global variable to access nvram, David Gibson, 2017/01/11
- [Qemu-devel] [PULL 27/67] target-ppc: implement lxvl instruction, David Gibson, 2017/01/11
- [Qemu-devel] [PULL 28/67] target-ppc: implement lxvll instruction, David Gibson, 2017/01/11
- [Qemu-devel] [PULL 36/67] ppc: Validate compatibility modes when setting, David Gibson, 2017/01/11
- [Qemu-devel] [PULL 45/67] hw/ppc: QOM'ify spapr_vio.c, David Gibson, 2017/01/11
- [Qemu-devel] [PULL 34/67] ppc: Rewrite ppc_set_compat(), David Gibson, 2017/01/11
- [Qemu-devel] [PULL 47/67] target-ppc: Add xxinsertw instruction, David Gibson, 2017/01/11
- [Qemu-devel] [PULL 51/67] target-ppc: Use float64 arg in helper_compute_fprf(), David Gibson, 2017/01/11
- [Qemu-devel] [PULL 40/67] qtest: convert ivshmem-test to use libqos, David Gibson, 2017/01/11
- [Qemu-devel] [PULL 60/67] pxb: Restrict to x86,
David Gibson <=
- [Qemu-devel] [PULL 49/67] prep: add IBM RS/6000 7020 (40p) memory controller, David Gibson, 2017/01/11
- [Qemu-devel] [PULL 64/67] target-ppc: Add xscvdpqp instruction, David Gibson, 2017/01/11
- [Qemu-devel] [PULL 37/67] qtest: add netfilter tests for ppc64, David Gibson, 2017/01/11
- [Qemu-devel] [PULL 56/67] target-ppc: Add xsxexpdp instruction, David Gibson, 2017/01/11
- [Qemu-devel] [PULL 57/67] target-ppc: Add xsxexpqp instruction, David Gibson, 2017/01/11
- [Qemu-devel] [PULL 62/67] ppc: Add ppc_set_compat_all(), David Gibson, 2017/01/11
- [Qemu-devel] [PULL 41/67] qtest: add ivshmem-test for ppc64, David Gibson, 2017/01/11
- [Qemu-devel] [PULL 58/67] target-ppc: Add xsxsigdp instruction, David Gibson, 2017/01/11
- [Qemu-devel] [PULL 59/67] target-ppc: Add xsxsigqp instructions, David Gibson, 2017/01/11
- [Qemu-devel] [PULL 46/67] target-ppc: Add xxextractuw instruction, David Gibson, 2017/01/11