From 315a1350c4a386065a73aad2ded1a11d77bf7771 Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Wed, 12 Dec 2012 13:32:14 +0200 Subject: [PATCH] pci: move pci core code to hw/pci Move files and modify makefiles to pick them at the new location. Signed-off-by: Michael S. Tsirkin --- hw/Makefile.objs | 11 ++--------- hw/i386/Makefile.objs | 2 +- hw/pci/Makefile.objs | 7 +++++++ hw/{ => pci}/msi.c | 0 hw/{ => pci}/msi.h | 0 hw/{ => pci}/msix.c | 0 hw/{ => pci}/msix.h | 0 hw/{ => pci}/pci-hotplug.c | 0 hw/{ => pci}/pci-stub.c | 0 hw/{ => pci}/pci.c | 0 hw/{ => pci}/pci.h | 0 hw/{ => pci}/pci_bridge.c | 0 hw/{ => pci}/pci_bridge.h | 0 hw/{ => pci}/pci_host.c | 0 hw/{ => pci}/pci_host.h | 0 hw/{ => pci}/pci_ids.h | 0 hw/{ => pci}/pci_internals.h | 0 hw/{ => pci}/pci_regs.h | 0 hw/{ => pci}/pcie.c | 0 hw/{ => pci}/pcie.h | 0 hw/{ => pci}/pcie_aer.c | 0 hw/{ => pci}/pcie_aer.h | 0 hw/{ => pci}/pcie_host.c | 0 hw/{ => pci}/pcie_host.h | 0 hw/{ => pci}/pcie_port.c | 0 hw/{ => pci}/pcie_port.h | 0 hw/{ => pci}/pcie_regs.h | 0 hw/{ => pci}/shpc.c | 0 hw/{ => pci}/shpc.h | 0 hw/{ => pci}/slotid_cap.c | 0 hw/{ => pci}/slotid_cap.h | 0 hw/ppc/Makefile.objs | 2 +- 32 files changed, 11 insertions(+), 11 deletions(-) create mode 100644 hw/pci/Makefile.objs rename hw/{ => pci}/msi.c (100%) rename hw/{ => pci}/msi.h (100%) rename hw/{ => pci}/msix.c (100%) rename hw/{ => pci}/msix.h (100%) rename hw/{ => pci}/pci-hotplug.c (100%) rename hw/{ => pci}/pci-stub.c (100%) rename hw/{ => pci}/pci.c (100%) rename hw/{ => pci}/pci.h (100%) rename hw/{ => pci}/pci_bridge.c (100%) rename hw/{ => pci}/pci_bridge.h (100%) rename hw/{ => pci}/pci_host.c (100%) rename hw/{ => pci}/pci_host.h (100%) rename hw/{ => pci}/pci_ids.h (100%) rename hw/{ => pci}/pci_internals.h (100%) rename hw/{ => pci}/pci_regs.h (100%) rename hw/{ => pci}/pcie.c (100%) rename hw/{ => pci}/pcie.h (100%) rename hw/{ => pci}/pcie_aer.c (100%) rename hw/{ => pci}/pcie_aer.h (100%) rename hw/{ => pci}/pcie_host.c (100%) rename hw/{ => pci}/pcie_host.h (100%) rename hw/{ => pci}/pcie_port.c (100%) rename hw/{ => pci}/pcie_port.h (100%) rename hw/{ => pci}/pcie_regs.h (100%) rename hw/{ => pci}/shpc.c (100%) rename hw/{ => pci}/shpc.h (100%) rename hw/{ => pci}/slotid_cap.c (100%) rename hw/{ => pci}/slotid_cap.h (100%) 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 similarity index 100% rename from hw/msi.c rename to hw/pci/msi.c diff --git a/hw/msi.h b/hw/pci/msi.h similarity index 100% rename from hw/msi.h rename to hw/pci/msi.h diff --git a/hw/msix.c b/hw/pci/msix.c similarity index 100% rename from hw/msix.c rename to hw/pci/msix.c diff --git a/hw/msix.h b/hw/pci/msix.h similarity index 100% rename from hw/msix.h rename to hw/pci/msix.h diff --git a/hw/pci-hotplug.c b/hw/pci/pci-hotplug.c similarity index 100% rename from hw/pci-hotplug.c rename to hw/pci/pci-hotplug.c diff --git a/hw/pci-stub.c b/hw/pci/pci-stub.c similarity index 100% rename from hw/pci-stub.c rename to hw/pci/pci-stub.c diff --git a/hw/pci.c b/hw/pci/pci.c similarity index 100% rename from hw/pci.c rename to hw/pci/pci.c diff --git a/hw/pci.h b/hw/pci/pci.h similarity index 100% rename from hw/pci.h rename to hw/pci/pci.h diff --git a/hw/pci_bridge.c b/hw/pci/pci_bridge.c similarity index 100% rename from hw/pci_bridge.c rename to hw/pci/pci_bridge.c diff --git a/hw/pci_bridge.h b/hw/pci/pci_bridge.h similarity index 100% rename from hw/pci_bridge.h rename to hw/pci/pci_bridge.h diff --git a/hw/pci_host.c b/hw/pci/pci_host.c similarity index 100% rename from hw/pci_host.c rename to hw/pci/pci_host.c diff --git a/hw/pci_host.h b/hw/pci/pci_host.h similarity index 100% rename from hw/pci_host.h rename to hw/pci/pci_host.h diff --git a/hw/pci_ids.h b/hw/pci/pci_ids.h similarity index 100% rename from hw/pci_ids.h rename to hw/pci/pci_ids.h diff --git a/hw/pci_internals.h b/hw/pci/pci_internals.h similarity index 100% rename from hw/pci_internals.h rename to hw/pci/pci_internals.h diff --git a/hw/pci_regs.h b/hw/pci/pci_regs.h similarity index 100% rename from hw/pci_regs.h rename to hw/pci/pci_regs.h diff --git a/hw/pcie.c b/hw/pci/pcie.c similarity index 100% rename from hw/pcie.c rename to hw/pci/pcie.c diff --git a/hw/pcie.h b/hw/pci/pcie.h similarity index 100% rename from hw/pcie.h rename to hw/pci/pcie.h diff --git a/hw/pcie_aer.c b/hw/pci/pcie_aer.c similarity index 100% rename from hw/pcie_aer.c rename to hw/pci/pcie_aer.c diff --git a/hw/pcie_aer.h b/hw/pci/pcie_aer.h similarity index 100% rename from hw/pcie_aer.h rename to hw/pci/pcie_aer.h diff --git a/hw/pcie_host.c b/hw/pci/pcie_host.c similarity index 100% rename from hw/pcie_host.c rename to hw/pci/pcie_host.c diff --git a/hw/pcie_host.h b/hw/pci/pcie_host.h similarity index 100% rename from hw/pcie_host.h rename to hw/pci/pcie_host.h diff --git a/hw/pcie_port.c b/hw/pci/pcie_port.c similarity index 100% rename from hw/pcie_port.c rename to hw/pci/pcie_port.c diff --git a/hw/pcie_port.h b/hw/pci/pcie_port.h similarity index 100% rename from hw/pcie_port.h rename to hw/pci/pcie_port.h diff --git a/hw/pcie_regs.h b/hw/pci/pcie_regs.h similarity index 100% rename from hw/pcie_regs.h rename to hw/pci/pcie_regs.h diff --git a/hw/shpc.c b/hw/pci/shpc.c similarity index 100% rename from hw/shpc.c rename to hw/pci/shpc.c diff --git a/hw/shpc.h b/hw/pci/shpc.h similarity index 100% rename from hw/shpc.h rename to hw/pci/shpc.h diff --git a/hw/slotid_cap.c b/hw/pci/slotid_cap.c similarity index 100% rename from hw/slotid_cap.c rename to hw/pci/slotid_cap.c diff --git a/hw/slotid_cap.h b/hw/pci/slotid_cap.h similarity index 100% rename from hw/slotid_cap.h rename to 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 -- 2.11.4.GIT