79ca616f29
pci-hotplug.c and the CONFIG_PCI_HOTPLUG variable which controls its
compilation are misnamed. They're not about PCI hotplug in general, but
rather about the pci_add/pci_del interface which are now deprecated in
favour of the more general device_add/device_del interface. This patch
therefore renames them to pci-hotplug-old.c and CONFIG_PCI_HOTPLUG_OLD.
CONFIG_PCI_HOTPLUG=y was listed twice in {i386,x86_64}-softmmu.make for no
particular reason, so we clean that up too. In addition it was included in
ppc64-softmmu.mak for which the old hotplug interface was never used and is
unsuitable, so we remove that too.
Most of pci-hotplug.c was additionaly protected by #ifdef TARGET_I386. The
small piece which wasn't is only called from the pci_add and pci_del hooks
in hmp-commands.hx, which themselves were protected by #ifdef TARGET_I386.
This patch therefore also removes the #ifdef from pci-hotplug-old.c,
and changes the ifdefs in hmp-commands.hx to use CONFIG_PCI_HOTPLUG_OLD.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
12 lines
414 B
Makefile
12 lines
414 B
Makefile
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
|
|
common-obj-$(CONFIG_ALL) += pci-stub.o
|
|
|
|
common-obj-$(CONFIG_PCI_HOTPLUG_OLD) += pci-hotplug-old.o
|