[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/35] hw: make all of hw/pci/ configurable via defa
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 09/35] hw: make all of hw/pci/ configurable via default-configs/ |
Date: |
Thu, 4 Apr 2013 21:22:49 +0200 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
default-configs/i386-softmmu.mak | 1 +
default-configs/ppc64-softmmu.mak | 2 ++
default-configs/x86_64-softmmu.mak | 1 +
hw/i386/Makefile.objs | 2 +-
hw/pci/Makefile.objs | 2 ++
hw/ppc/Makefile.objs | 2 +-
6 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index a2658cd..e041a63 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -28,3 +28,4 @@ CONFIG_I8259=y
CONFIG_PFLASH_CFI01=y
CONFIG_TPM_TIS=y
CONFIG_TPM_PASSTHROUGH=y
+CONFIG_PCI_HOTPLUG=y
diff --git a/default-configs/ppc64-softmmu.mak
b/default-configs/ppc64-softmmu.mak
index ee895e9..26f74b0 100644
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -42,3 +42,5 @@ CONFIG_I8259=y
CONFIG_XILINX=y
CONFIG_PSERIES=$(CONFIG_FDT)
CONFIG_E500=$(CONFIG_FDT)
+# For pSeries
+CONFIG_PCI_HOTPLUG=y
diff --git a/default-configs/x86_64-softmmu.mak
b/default-configs/x86_64-softmmu.mak
index fe4b70b..5ba1116 100644
--- a/default-configs/x86_64-softmmu.mak
+++ b/default-configs/x86_64-softmmu.mak
@@ -28,3 +28,4 @@ CONFIG_I8259=y
CONFIG_PFLASH_CFI01=y
CONFIG_TPM_TIS=y
CONFIG_TPM_PASSTHROUGH=y
+CONFIG_PCI_HOTPLUG=y
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
index a78c0b2..c813b1e 100644
--- a/hw/i386/Makefile.objs
+++ b/hw/i386/Makefile.objs
@@ -2,7 +2,7 @@ obj-y += mc146818rtc.o
obj-y += apic_common.o apic.o
obj-y += sga.o ioapic_common.o ioapic.o piix_pci.o
obj-y += vmport.o
-obj-y += pci/pci-hotplug.o wdt_ib700.o
+obj-y += wdt_ib700.o
obj-y += debugcon.o debugexit.o
obj-y += pc_sysfw.o
obj-y += lpc_ich9.o q35.o
diff --git a/hw/pci/Makefile.objs b/hw/pci/Makefile.objs
index aac5f65..a1511ab 100644
--- a/hw/pci/Makefile.objs
+++ b/hw/pci/Makefile.objs
@@ -9,3 +9,5 @@ common-obj-$(CONFIG_NO_PCI) += pci-stub.o
common-obj-$(CONFIG_ALL) += pci-stub.o
common-obj-$(CONFIG_PCI) += bridge/ host/
+
+obj-$(CONFIG_PCI_HOTPLUG) += pci-hotplug.o
diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs
index 4de0209..ef1d9ed 100644
--- a/hw/ppc/Makefile.objs
+++ b/hw/ppc/Makefile.objs
@@ -2,7 +2,7 @@
obj-y += mc146818rtc.o
# IBM pSeries (sPAPR)
obj-$(CONFIG_PSERIES) += spapr_vty.o spapr_llan.o spapr_vscsi.o
-obj-$(CONFIG_PSERIES) += spapr_pci.o pci/pci-hotplug.o
+obj-$(CONFIG_PSERIES) += spapr_pci.o
obj-$(CONFIG_PSERIES) += spapr_nvram.o
# PowerPC 4xx boards
obj-y += ppc4xx_pci.o
--
1.8.1.4
- [Qemu-devel] [PATCH v3 00/35] hw/ reorganization, part 2, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 01/35] build: enable using $(CONFIG_FOO) on the rhs of config files, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 03/35] hw: make subdirectories for devices, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 04/35] moxie: configure with default-configs file, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 06/35] hw: move virtio devices to hw/ subdirectories, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 07/35] hw: make all of hw/ide/ configurable via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 08/35] hw: make all of hw/usb/ configurable via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 10/35] hw: move watchdogs to hw/watchdog, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 09/35] hw: make all of hw/pci/ configurable via default-configs/,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 13/35] hw: move block devices to hw/block/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 05/35] hw: move target-independent files to subdirectories, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 11/35] hw: move MC146818RTC to hw/timer/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 12/35] hw: move NICs to hw/net/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 14/35] hw: move audio devices to hw/audio/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 15/35] hw: move display devices to hw/display/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 17/35] hw: move SSI controllers to hw/ssi/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 16/35] hw: move I2C controllers to hw/i2c/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 18/35] hw: move SCSI controllers to hw/scsi/, configure via default-configs/, Paolo Bonzini, 2013/04/04
- [Qemu-devel] [PATCH 19/35] hw: move more files to hw/xen/, Paolo Bonzini, 2013/04/04