This patchset starts some cleanups of the pci core by rearranging the code: pci core is split out from devices into its own directory, pci internals.h is renamed as it's used externally a lot.
I'd like to merge this quickly to avoid conflicting with others work. Plan to send pull request tomorrow, if you have concerns, speak up soon pls. Thanks, Michael S. Tsirkin (8): pci: prepare makefiles for pci code reorganization MAINTAINERS: add hw/pci/ to list of PCI files pci: move pci core code to hw/pci pci: update all users to look in pci/ pci: make external dependencies explicit Revert "pci: prepare makefiles for pci code reorganization" pci: rename pci_internals.h pci_bus.h pci_bus: update comment MAINTAINERS | 1 + arch_init.c | 2 +- hw/Makefile.objs | 10 +- hw/ac97.c | 2 +- hw/acpi_ich9.c | 2 +- hw/acpi_piix4.c | 2 +- hw/alpha_sys.h | 4 +- hw/apb_pci.c | 8 +- hw/apic.c | 2 +- hw/bonito.c | 4 +- hw/cirrus_vga.c | 2 +- hw/dec_pci.c | 8 +- hw/e1000.c | 2 +- hw/eepro100.c | 2 +- hw/es1370.c | 2 +- hw/esp-pci.c | 2 +- hw/grackle_pci.c | 4 +- hw/gt64xxx.c | 4 +- hw/hda-audio.c | 2 +- hw/i386/Makefile.objs | 2 +- hw/i82378.c | 2 +- hw/i82801b11.c | 2 +- hw/ich9.h | 8 +- hw/ide.h | 2 +- hw/ide/ahci.c | 4 +- hw/ide/cmd646.c | 2 +- hw/ide/core.c | 2 +- hw/ide/ich.c | 4 +- hw/ide/pci.c | 2 +- hw/ide/piix.c | 2 +- hw/ide/via.c | 2 +- hw/intel-hda.c | 4 +- hw/ioh3420.c | 6 +- hw/ioh3420.h | 2 +- hw/ivshmem.c | 4 +- hw/kvm/apic.c | 2 +- hw/kvm/pci-assign.c | 4 +- hw/lpc_ich9.c | 8 +- hw/lsi53c895a.c | 2 +- hw/macio.c | 2 +- hw/megasas.c | 4 +- hw/mips_fulong2e.c | 2 +- hw/mips_malta.c | 2 +- hw/msi.c | 395 --------- hw/msi.h | 50 -- hw/msix.c | 562 ------------ hw/msix.h | 41 - hw/ne2000.c | 2 +- hw/openpic.c | 2 +- hw/pc.c | 4 +- hw/pc_piix.c | 4 +- hw/pci-hotplug.c | 293 ------- hw/pci-stub.c | 47 - hw/pci.c | 2168 ---------------------------------------------- hw/pci.h | 684 --------------- hw/pci/Makefile.objs | 6 + hw/pci/msi.c | 395 +++++++++ hw/pci/msi.h | 50 ++ hw/pci/msix.c | 562 ++++++++++++ hw/pci/msix.h | 41 + hw/pci/pci-hotplug.c | 293 +++++++ hw/pci/pci-stub.c | 47 + hw/pci/pci.c | 2168 ++++++++++++++++++++++++++++++++++++++++++++++ hw/pci/pci.h | 684 +++++++++++++++ hw/pci/pci_bridge.c | 363 ++++++++ hw/pci/pci_bridge.h | 66 ++ hw/pci/pci_bus.h | 74 ++ hw/pci/pci_host.c | 180 ++++ hw/pci/pci_host.h | 62 ++ hw/pci/pci_ids.h | 147 ++++ hw/pci/pci_regs.h | 717 +++++++++++++++ hw/pci/pcie.c | 555 ++++++++++++ hw/pci/pcie.h | 142 +++ hw/pci/pcie_aer.c | 1032 ++++++++++++++++++++++ hw/pci/pcie_aer.h | 106 +++ hw/pci/pcie_host.c | 161 ++++ hw/pci/pcie_host.h | 54 ++ hw/pci/pcie_port.c | 114 +++ hw/pci/pcie_port.h | 51 ++ hw/pci/pcie_regs.h | 156 ++++ hw/pci/shpc.c | 681 +++++++++++++++ hw/pci/shpc.h | 48 + hw/pci/slotid_cap.c | 44 + hw/pci/slotid_cap.h | 11 + hw/pci_bridge.c | 363 -------- hw/pci_bridge.h | 66 -- hw/pci_bridge_dev.c | 12 +- hw/pci_host.c | 180 ---- hw/pci_host.h | 62 -- hw/pci_ids.h | 147 ---- hw/pci_internals.h | 78 -- hw/pci_regs.h | 717 --------------- hw/pcie.c | 555 ------------ hw/pcie.h | 142 --- hw/pcie_aer.c | 1032 ---------------------- hw/pcie_aer.h | 106 --- hw/pcie_host.c | 161 ---- hw/pcie_host.h | 54 -- hw/pcie_port.c | 114 --- hw/pcie_port.h | 51 -- hw/pcie_regs.h | 156 ---- hw/pcnet-pci.c | 2 +- hw/piix4.c | 2 +- hw/piix_pci.c | 4 +- hw/ppc/Makefile.objs | 2 +- hw/ppc/e500.c | 2 +- hw/ppc440_bamboo.c | 2 +- hw/ppc4xx.h | 2 +- hw/ppc4xx_pci.c | 4 +- hw/ppc_newworld.c | 2 +- hw/ppc_oldworld.c | 2 +- hw/ppc_prep.c | 4 +- hw/ppce500_pci.c | 4 +- hw/prep_pci.c | 4 +- hw/q35.h | 4 +- hw/qxl.h | 2 +- hw/r2d.c | 2 +- hw/realview.c | 2 +- hw/rtl8139.c | 2 +- hw/serial-pci.c | 2 +- hw/sga.c | 2 +- hw/sh_pci.c | 4 +- hw/shpc.c | 681 --------------- hw/shpc.h | 48 - hw/slotid_cap.c | 44 - hw/slotid_cap.h | 11 - hw/smbus_ich9.c | 2 +- hw/spapr.c | 4 +- hw/spapr_pci.c | 10 +- hw/spapr_pci.h | 4 +- hw/sun4u.c | 2 +- hw/unin_pci.c | 4 +- hw/usb/hcd-ehci-pci.c | 2 +- hw/usb/hcd-ohci.c | 2 +- hw/usb/hcd-uhci.c | 2 +- hw/usb/hcd-xhci.c | 6 +- hw/versatile_pci.c | 4 +- hw/versatilepb.c | 2 +- hw/vfio_pci.c | 6 +- hw/vga-pci.c | 2 +- hw/vga.c | 2 +- hw/virtio-balloon.h | 2 +- hw/virtio-net.h | 2 +- hw/virtio-pci.c | 6 +- hw/virtio-scsi.h | 2 +- hw/vmware_vga.c | 2 +- hw/vt82c686.c | 4 +- hw/wdt_i6300esb.c | 2 +- hw/xen-host-pci-device.h | 2 +- hw/xen_apic.c | 2 +- hw/xen_platform.c | 2 +- hw/xen_pt.c | 2 +- hw/xen_pt.h | 2 +- hw/xio3130_downstream.c | 6 +- hw/xio3130_downstream.h | 2 +- hw/xio3130_upstream.c | 6 +- hw/xio3130_upstream.h | 2 +- kvm-all.c | 2 +- kvm-stub.c | 2 +- monitor.c | 2 +- target-i386/kvm.c | 2 +- xen-all.c | 2 +- 162 files changed, 9173 insertions(+), 9176 deletions(-) delete mode 100644 hw/msi.c delete mode 100644 hw/msi.h delete mode 100644 hw/msix.c delete mode 100644 hw/msix.h delete mode 100644 hw/pci-hotplug.c delete mode 100644 hw/pci-stub.c delete mode 100644 hw/pci.c delete mode 100644 hw/pci.h create mode 100644 hw/pci/Makefile.objs create mode 100644 hw/pci/msi.c create mode 100644 hw/pci/msi.h create mode 100644 hw/pci/msix.c create mode 100644 hw/pci/msix.h create mode 100644 hw/pci/pci-hotplug.c create mode 100644 hw/pci/pci-stub.c create mode 100644 hw/pci/pci.c create mode 100644 hw/pci/pci.h create mode 100644 hw/pci/pci_bridge.c create mode 100644 hw/pci/pci_bridge.h create mode 100644 hw/pci/pci_bus.h create mode 100644 hw/pci/pci_host.c create mode 100644 hw/pci/pci_host.h create mode 100644 hw/pci/pci_ids.h create mode 100644 hw/pci/pci_regs.h create mode 100644 hw/pci/pcie.c create mode 100644 hw/pci/pcie.h create mode 100644 hw/pci/pcie_aer.c create mode 100644 hw/pci/pcie_aer.h create mode 100644 hw/pci/pcie_host.c create mode 100644 hw/pci/pcie_host.h create mode 100644 hw/pci/pcie_port.c create mode 100644 hw/pci/pcie_port.h create mode 100644 hw/pci/pcie_regs.h create mode 100644 hw/pci/shpc.c create mode 100644 hw/pci/shpc.h create mode 100644 hw/pci/slotid_cap.c create mode 100644 hw/pci/slotid_cap.h delete mode 100644 hw/pci_bridge.c delete mode 100644 hw/pci_bridge.h delete mode 100644 hw/pci_host.c delete mode 100644 hw/pci_host.h delete mode 100644 hw/pci_ids.h delete mode 100644 hw/pci_internals.h delete mode 100644 hw/pci_regs.h delete mode 100644 hw/pcie.c delete mode 100644 hw/pcie.h delete mode 100644 hw/pcie_aer.c delete mode 100644 hw/pcie_aer.h delete mode 100644 hw/pcie_host.c delete mode 100644 hw/pcie_host.h delete mode 100644 hw/pcie_port.c delete mode 100644 hw/pcie_port.h delete mode 100644 hw/pcie_regs.h delete mode 100644 hw/shpc.c delete mode 100644 hw/shpc.h delete mode 100644 hw/slotid_cap.c delete mode 100644 hw/slotid_cap.h -- MST