32 files changed, 11 insertions, 11 deletions
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index d581d8d6d6..9d33b189e6 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -1,14 +1,10 @@
-common-obj-y = usb/ ide/
+common-obj-y = usb/ ide/ pci/
 common-obj-y += loader.o
 common-obj-$(CONFIG_VIRTIO) += virtio-console.o
 common-obj-$(CONFIG_VIRTIO) += virtio-rng.o
 common-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
 common-obj-y += fw_cfg.o
-common-obj-$(CONFIG_PCI) += pci.o pci_bridge.o pci_bridge_dev.o
-common-obj-$(CONFIG_PCI) += msix.o msi.o
-common-obj-$(CONFIG_PCI) += shpc.o
-common-obj-$(CONFIG_PCI) += slotid_cap.o
-common-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o
+common-obj-$(CONFIG_PCI) += pci_bridge_dev.o
 common-obj-$(CONFIG_PCI) += ioh3420.o xio3130_upstream.o xio3130_downstream.o
 common-obj-$(CONFIG_PCI) += i82801b11.o
 common-obj-y += watchdog.o
@@ -102,8 +98,6 @@ common-obj-$(CONFIG_XGMAC) += xgmac.o
 # PCI watchdog devices
 common-obj-$(CONFIG_PCI) += wdt_i6300esb.o
 
-common-obj-$(CONFIG_PCI) += pcie.o pcie_aer.o pcie_port.o
-
 # PCI network cards
 common-obj-$(CONFIG_NE2000_PCI) += ne2000.o
 common-obj-$(CONFIG_EEPRO100_PCI) += eepro100.o
@@ -199,7 +193,6 @@ obj-$(CONFIG_VIRTIO) += virtio-serial-bus.o virtio-scsi.o
 obj-$(CONFIG_SOFTMMU) += vhost_net.o
 obj-$(CONFIG_VHOST_NET) += vhost.o
 obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/
-obj-$(CONFIG_NO_PCI) += pci-stub.o
 obj-$(CONFIG_VGA) += vga.o
 obj-$(CONFIG_SOFTMMU) += device-hotplug.o
 obj-$(CONFIG_XEN) += xen_domainbuild.o xen_machine_pv.o
diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs
index 0d3f6a8e84..257f3c1a91 100644
--- a/hw/i386/Makefile.objs
+++ b/hw/i386/Makefile.objs
@@ -2,7 +2,7 @@ obj-y += mc146818rtc.o pc.o
 obj-y += apic_common.o apic.o kvmvapic.o
 obj-y += sga.o ioapic_common.o ioapic.o piix_pci.o
 obj-y += vmport.o
-obj-y += pci-hotplug.o smbios.o wdt_ib700.o
+obj-y += pci/pci-hotplug.o smbios.o wdt_ib700.o
 obj-y += debugcon.o multiboot.o
 obj-y += pc_piix.o
 obj-y += pc_sysfw.o
diff --git a/hw/pci/Makefile.objs b/hw/pci/Makefile.objs
new file mode 100644
index 0000000000..aa7a0e84b5
--- /dev/null
+++ b/hw/pci/Makefile.objs
@@ -0,0 +1,7 @@
+common-obj-$(CONFIG_PCI) += pci.o pci_bridge.o
+common-obj-$(CONFIG_PCI) += msix.o msi.o
+common-obj-$(CONFIG_PCI) += shpc.o
+common-obj-$(CONFIG_PCI) += slotid_cap.o
+common-obj-$(CONFIG_PCI) += pci_host.o pcie_host.o
+common-obj-$(CONFIG_PCI) += pcie.o pcie_aer.o pcie_port.o
+common-obj-$(CONFIG_NO_PCI) += pci-stub.o
diff --git a/hw/msi.c b/hw/pci/msi.c
index 33037a80e9..33037a80e9 100644
--- a/hw/msi.c
+++ b/hw/pci/msi.c
diff --git a/hw/msi.h b/hw/pci/msi.h
index 150b09a19d..150b09a19d 100644
--- a/hw/msi.h
+++ b/hw/pci/msi.h
diff --git a/hw/msix.c b/hw/pci/msix.c
index 136ef09373..136ef09373 100644
--- a/hw/msix.c
+++ b/hw/pci/msix.c
diff --git a/hw/msix.h b/hw/pci/msix.h
index 15211cb592..15211cb592 100644
--- a/hw/msix.h
+++ b/hw/pci/msix.h
diff --git a/hw/pci-hotplug.c b/hw/pci/pci-hotplug.c
index 3bcfdcc1a6..3bcfdcc1a6 100644
--- a/hw/pci-hotplug.c
+++ b/hw/pci/pci-hotplug.c
diff --git a/hw/pci-stub.c b/hw/pci/pci-stub.c
index 134c4484b6..134c4484b6 100644
--- a/hw/pci-stub.c
+++ b/hw/pci/pci-stub.c
diff --git a/hw/pci.c b/hw/pci/pci.c
index 97a0cd77c1..97a0cd77c1 100644
--- a/hw/pci.c
+++ b/hw/pci/pci.c
diff --git a/hw/pci.h b/hw/pci/pci.h
index 4da0c2a4c9..4da0c2a4c9 100644
--- a/hw/pci.h
+++ b/hw/pci/pci.h
diff --git a/hw/pci_bridge.c b/hw/pci/pci_bridge.c
index 4680501e4e..4680501e4e 100644
--- a/hw/pci_bridge.c
+++ b/hw/pci/pci_bridge.c
diff --git a/hw/pci_bridge.h b/hw/pci/pci_bridge.h
index a00accc172..a00accc172 100644
--- a/hw/pci_bridge.h
+++ b/hw/pci/pci_bridge.h
diff --git a/hw/pci_host.c b/hw/pci/pci_host.c
index 68e328cd23..68e328cd23 100644
--- a/hw/pci_host.c
+++ b/hw/pci/pci_host.c
diff --git a/hw/pci_host.h b/hw/pci/pci_host.h
index 4b9c300fcf..4b9c300fcf 100644
--- a/hw/pci_host.h
+++ b/hw/pci/pci_host.h
diff --git a/hw/pci_ids.h b/hw/pci/pci_ids.h
index 5df7245349..5df7245349 100644
--- a/hw/pci_ids.h
+++ b/hw/pci/pci_ids.h
diff --git a/hw/pci_internals.h b/hw/pci/pci_internals.h
index 21d0ce6973..21d0ce6973 100644
--- a/hw/pci_internals.h
+++ b/hw/pci/pci_internals.h
diff --git a/hw/pci_regs.h b/hw/pci/pci_regs.h
index 56a404be6e..56a404be6e 100644
--- a/hw/pci_regs.h
+++ b/hw/pci/pci_regs.h
diff --git a/hw/pcie.c b/hw/pci/pcie.c
index 7c92f193e7..7c92f193e7 100644
--- a/hw/pcie.c
+++ b/hw/pci/pcie.c
diff --git a/hw/pcie.h b/hw/pci/pcie.h
index 4889194ae6..4889194ae6 100644
--- a/hw/pcie.h
+++ b/hw/pci/pcie.h
diff --git a/hw/pcie_aer.c b/hw/pci/pcie_aer.c
index b04c164e22..b04c164e22 100644
--- a/hw/pcie_aer.c
+++ b/hw/pci/pcie_aer.c
diff --git a/hw/pcie_aer.h b/hw/pci/pcie_aer.h
index 7539500cd8..7539500cd8 100644
--- a/hw/pcie_aer.h
+++ b/hw/pci/pcie_aer.h
diff --git a/hw/pcie_host.c b/hw/pci/pcie_host.c
index c257fb43ca..c257fb43ca 100644
--- a/hw/pcie_host.c
+++ b/hw/pci/pcie_host.c
diff --git a/hw/pcie_host.h b/hw/pci/pcie_host.h
index 392193530d..392193530d 100644
--- a/hw/pcie_host.h
+++ b/hw/pci/pcie_host.h
diff --git a/hw/pcie_port.c b/hw/pci/pcie_port.c
index d6350e5e73..d6350e5e73 100644
--- a/hw/pcie_port.c
+++ b/hw/pci/pcie_port.c
diff --git a/hw/pcie_port.h b/hw/pci/pcie_port.h
index 3709583cc0..3709583cc0 100644
--- a/hw/pcie_port.h
+++ b/hw/pci/pcie_port.h
diff --git a/hw/pcie_regs.h b/hw/pci/pcie_regs.h
index 4d123d9fcc..4d123d9fcc 100644
--- a/hw/pcie_regs.h
+++ b/hw/pci/pcie_regs.h
diff --git a/hw/shpc.c b/hw/pci/shpc.c
index 4597bbde75..4597bbde75 100644
--- a/hw/shpc.c
+++ b/hw/pci/shpc.c
diff --git a/hw/shpc.h b/hw/pci/shpc.h
index 130b71df30..130b71df30 100644
--- a/hw/shpc.h
+++ b/hw/pci/shpc.h
diff --git a/hw/slotid_cap.c b/hw/pci/slotid_cap.c
index 01064521a9..01064521a9 100644
--- a/hw/slotid_cap.c
+++ b/hw/pci/slotid_cap.c
diff --git a/hw/slotid_cap.h b/hw/pci/slotid_cap.h
index 70db0470b0..70db0470b0 100644
--- a/hw/slotid_cap.h
+++ b/hw/pci/slotid_cap.h
diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs
index 8fe21235f0..cb7cf8fba5 100644
--- a/hw/ppc/Makefile.objs
+++ b/hw/ppc/Makefile.objs
@@ -10,7 +10,7 @@ obj-y += ppc_newworld.o
 # IBM pSeries (sPAPR)
 obj-$(CONFIG_PSERIES) += spapr.o spapr_hcall.o spapr_rtas.o spapr_vio.o
 obj-$(CONFIG_PSERIES) += xics.o spapr_vty.o spapr_llan.o spapr_vscsi.o
-obj-$(CONFIG_PSERIES) += spapr_pci.o pci-hotplug.o spapr_iommu.o
+obj-$(CONFIG_PSERIES) += spapr_pci.o pci/pci-hotplug.o spapr_iommu.o
 obj-$(CONFIG_PSERIES) += spapr_events.o
 # PowerPC 4xx boards
 obj-y += ppc4xx_devs.o ppc4xx_pci.o ppc405_uc.o ppc405_boards.o