From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
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 [thread overview]
Message-ID: <1365103395-11547-10-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1365103395-11547-1-git-send-email-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
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
next prev parent reply other threads:[~2013-04-04 19:23 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-04 19:22 [Qemu-devel] [PATCH v3 00/35] hw/ reorganization, part 2 Paolo Bonzini
2013-04-04 19:22 ` [Qemu-devel] [PATCH 01/35] build: enable using $(CONFIG_FOO) on the rhs of config files Paolo Bonzini
2013-04-04 19:22 ` [Qemu-devel] [PATCH 02/35] hw: move headers to include/ Paolo Bonzini
2013-04-09 8:35 ` Markus Armbruster
2013-04-09 8:43 ` Paolo Bonzini
2013-04-04 19:22 ` [Qemu-devel] [PATCH 03/35] hw: make subdirectories for devices Paolo Bonzini
2013-04-04 19:22 ` [Qemu-devel] [PATCH 04/35] moxie: configure with default-configs file Paolo Bonzini
2013-04-04 19:22 ` [Qemu-devel] [PATCH 05/35] hw: move target-independent files to subdirectories Paolo Bonzini
2013-04-04 19:22 ` [Qemu-devel] [PATCH 06/35] hw: move virtio devices to hw/ subdirectories Paolo Bonzini
2013-04-04 19:22 ` [Qemu-devel] [PATCH 07/35] hw: make all of hw/ide/ configurable via default-configs/ Paolo Bonzini
2013-04-04 19:22 ` [Qemu-devel] [PATCH 08/35] hw: make all of hw/usb/ " Paolo Bonzini
2013-04-04 19:22 ` Paolo Bonzini [this message]
2013-04-04 19:22 ` [Qemu-devel] [PATCH 10/35] hw: move watchdogs to hw/watchdog, configure " Paolo Bonzini
2013-04-04 19:22 ` [Qemu-devel] [PATCH 11/35] hw: move MC146818RTC to hw/timer/, " Paolo Bonzini
2013-04-04 19:22 ` [Qemu-devel] [PATCH 12/35] hw: move NICs to hw/net/, " Paolo Bonzini
2013-04-04 19:22 ` [Qemu-devel] [PATCH 13/35] hw: move block devices to hw/block/, " Paolo Bonzini
2013-04-04 19:22 ` [Qemu-devel] [PATCH 14/35] hw: move audio devices to hw/audio/, " Paolo Bonzini
2013-04-04 19:22 ` [Qemu-devel] [PATCH 15/35] hw: move display devices to hw/display/, " Paolo Bonzini
2013-04-04 19:22 ` [Qemu-devel] [PATCH 16/35] hw: move I2C controllers to hw/i2c/, " Paolo Bonzini
2013-04-04 19:22 ` [Qemu-devel] [PATCH 17/35] hw: move SSI controllers to hw/ssi/, " Paolo Bonzini
2013-04-04 19:22 ` [Qemu-devel] [PATCH 18/35] hw: move SCSI controllers to hw/scsi/, " Paolo Bonzini
2013-04-04 19:22 ` [Qemu-devel] [PATCH 19/35] hw: move more files to hw/xen/ Paolo Bonzini
2013-04-04 19:23 ` [Qemu-devel] [PATCH 20/35] hw: move char devices to hw/char/, configure via default-configs/ Paolo Bonzini
2013-04-04 19:23 ` [Qemu-devel] [PATCH 21/35] hw: move ISA bridges and devices to hw/isa/, configure with default-configs/ Paolo Bonzini
2013-04-04 19:23 ` [Qemu-devel] [PATCH 22/35] hw: move timer devices to hw/timer/, " Paolo Bonzini
2013-04-04 19:23 ` [Qemu-devel] [PATCH 23/35] hw: move SD/MMC devices to hw/sd/, " Paolo Bonzini
2013-04-04 19:23 ` [Qemu-devel] [PATCH 24/35] hw: move PCI bridges to hw/pci-* or hw/ARCH Paolo Bonzini
2013-04-04 19:23 ` [Qemu-devel] [PATCH 25/35] hw: move VFIO and ivshmem to hw/misc/ Paolo Bonzini
2013-04-04 19:23 ` [Qemu-devel] [PATCH 26/35] hw: move DMA controllers to hw/dma/, configure with default-configs/ Paolo Bonzini
2013-04-04 19:23 ` [Qemu-devel] [PATCH 27/35] hw: move interrupt controllers to hw/intc/, " Paolo Bonzini
2013-04-04 19:23 ` [Qemu-devel] [PATCH 28/35] hw: move GPIO interfaces to hw/gpio/, " Paolo Bonzini
2013-04-04 19:23 ` [Qemu-devel] [PATCH 29/35] hw: move NVRAM interfaces to hw/nvram/, " Paolo Bonzini
2013-04-04 19:23 ` [Qemu-devel] [PATCH 30/35] hw: move other devices to hw/misc/, " Paolo Bonzini
2013-04-04 19:23 ` [Qemu-devel] [PATCH 31/35] hw: move ARM CPU cores to hw/cpu/, " Paolo Bonzini
2013-04-04 19:23 ` [Qemu-devel] [PATCH 32/35] hw: move hw/kvm/ to hw/i386/kvm Paolo Bonzini
2013-04-04 19:23 ` [Qemu-devel] [PATCH 33/35] hw: move last file to hw/arm/ Paolo Bonzini
2013-04-04 19:23 ` [Qemu-devel] [PATCH 34/35] MAINTAINERS: update for source code movement Paolo Bonzini
2013-04-04 19:23 ` [Qemu-devel] [PATCH 35/35] hw: move private headers to hw/ subdirectories Paolo Bonzini
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=1365103395-11547-10-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--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).