diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2013-06-06 18:48:45 +1000 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2013-07-04 10:45:31 +0300 |
| commit | 79ca616f291124d166ca173e512c4ace1c2fe8b2 (patch) | |
| tree | 6aee4da6182397a7d0e9cd8cfeb37515573059db /hw | |
| parent | fea7d5966a54a5e5400cd38897a95ea576b5af4d (diff) | |
pci: Cleanup configuration for pci-hotplug.c
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>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/pci/Makefile.objs | 2 | ||||
| -rw-r--r-- | hw/pci/pci-hotplug-old.c (renamed from hw/pci/pci-hotplug.c) | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/hw/pci/Makefile.objs b/hw/pci/Makefile.objs index a7fb9d0c11..720f438ac9 100644 --- a/hw/pci/Makefile.objs +++ b/hw/pci/Makefile.objs @@ -8,4 +8,4 @@ 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 -obj-$(CONFIG_PCI_HOTPLUG) += pci-hotplug.o +common-obj-$(CONFIG_PCI_HOTPLUG_OLD) += pci-hotplug-old.o diff --git a/hw/pci/pci-hotplug.c b/hw/pci/pci-hotplug-old.c index 12287d1efc..b3c233caef 100644 --- a/hw/pci/pci-hotplug.c +++ b/hw/pci/pci-hotplug-old.c @@ -1,5 +1,7 @@ /* - * QEMU PCI hotplug support + * Deprecated PCI hotplug interface support + * This covers the old pci_add / pci_del command, whereas the more general + * device_add / device_del commands are now preferred. * * Copyright (c) 2004 Fabrice Bellard * @@ -34,7 +36,6 @@ #include "sysemu/blockdev.h" #include "qapi/error.h" -#if defined(TARGET_I386) static PCIDevice *qemu_pci_hot_add_nic(Monitor *mon, const char *devaddr, const char *opts_str) @@ -257,7 +258,6 @@ void pci_device_hot_add(Monitor *mon, const QDict *qdict) } else monitor_printf(mon, "failed to add %s\n", opts); } -#endif static int pci_device_hot_remove(Monitor *mon, const char *pci_addr) { |