Merge commit '1dd3a74d2ee2d873cde0b390b536e45420b3fe05' into HEAD

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --cc Makefile.objs
index 3c7abca,3c7abca..20fb2c5
--- 1/Makefile.objs
--- 2/Makefile.objs
+++ b/Makefile.objs
@@@ -92,6 -92,6 +92,8 @@@ common-obj-$(CONFIG_SPICE) += spice-qem
  
  common-obj-y += audio/
  common-obj-y += hw/
++extra-obj-y += hw/
++
  common-obj-y += ui/
  common-obj-y += bt-host.o bt-vhci.o
  

diff --cc arch_init.c
Simple merge

diff --cc hw/Makefile.objs
index d581d8d,9d33b18..bcf278d
--- 1/hw/Makefile.objs
--- 2/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@@ -41,6 -37,6 +37,8 @@@ common-obj-$(CONFIG_I8259) += i8259_com
  common-obj-y += fifo.o
  common-obj-y += pam.o
  
++extra-obj-y += pci/
++
  # PPC devices
  common-obj-$(CONFIG_PREP_PCI) += prep_pci.o
  common-obj-$(CONFIG_I82378) += i82378.o

diff --cc hw/ide/core.c
Simple merge

diff --cc hw/openpic.c
index 3cbcea8,4791dc6..9c956b9
--- 1/hw/openpic.c
--- 2/hw/openpic.c
+++ b/hw/openpic.c
@@@ -35,10 -35,8 +35,10 @@@
   */
  #include "hw.h"
  #include "ppc_mac.h"
- #include "pci.h"
+ #include "pci/pci.h"
  #include "openpic.h"
- #include "msi.h"
 +#include "sysbus.h"
++#include "pci/msi.h"
  
  //#define DEBUG_OPENPIC
  

diff --cc hw/pci/Makefile.objs
index 0000000,aa7a0e8..fe965fe
mode 000000,100644..100644
--- /dev/null
--- 2/hw/pci/Makefile.objs
+++ b/hw/pci/Makefile.objs
@@@ -1,0 -1,7 +1,9 @@@
+ 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
++
++extra-obj-y += pci-stub.o

diff --cc hw/pci/msix.c
Simple merge

diff --cc hw/ppc/Makefile.objs
index 4492127,cb7cf8f..afdcc0e
--- 1/hw/ppc/Makefile.objs
--- 2/hw/ppc/Makefile.objs
+++ b/hw/ppc/Makefile.objs
@@@ -10,8 -10,8 +10,8 @@@ obj-y += ppc_newworld.
  # 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
 +obj-$(CONFIG_PSERIES) += spapr_events.o spapr_nvram.o
  # PowerPC 4xx boards
  obj-y += ppc4xx_devs.o ppc4xx_pci.o ppc405_uc.o ppc405_boards.o
  obj-y += ppc440_bamboo.o

diff --cc hw/ppc/e500.c
Simple merge

diff --cc hw/ppc_newworld.c
Simple merge

diff --cc hw/ppce500_pci.c
index 09e3507,39022aa..9bffbb9
--- 1/hw/ppce500_pci.c
--- 2/hw/ppce500_pci.c
+++ b/hw/ppce500_pci.c
@@@ -15,11 -15,9 +15,11 @@@
   */
  
  #include "hw.h"
- #include "pci.h"
- #include "pci_host.h"
 +#include "hw/ppc/e500-ccsr.h"
+ #include "pci/pci.h"
+ #include "pci/pci_host.h"
  #include "bswap.h"
 +#include "ppce500_pci.h"
  
  #ifdef DEBUG_PCI
  #define pci_debug(fmt, ...) fprintf(stderr, fmt, ## __VA_ARGS__)

diff --cc hw/realview.c
Simple merge

diff --cc hw/spapr.c
Simple merge

diff --cc hw/versatilepb.c
Simple merge

diff --cc hw/vfio_pci.c
Simple merge

diff --cc hw/vga.c
Simple merge

diff --cc hw/virtio-pci.c
Simple merge