Commit 79ca616f authored by David Gibson's avatar David Gibson Committed by Michael S. Tsirkin
Browse files

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: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent fea7d596

default-configs/i386-softmmu.mak

+1 −2
Original line number Diff line number Diff line
@@ -28,11 +28,10 @@ CONFIG_APPLESMC=y 
CONFIG_I8259=y

CONFIG_PFLASH_CFI01=y

CONFIG_TPM_TIS=$(CONFIG_TPM)

CONFIG_PCI_HOTPLUG=y

CONFIG_PCI_HOTPLUG_OLD=y

CONFIG_MC146818RTC=y

CONFIG_PAM=y

CONFIG_PCI_PIIX=y

CONFIG_PCI_HOTPLUG=y

CONFIG_WDT_IB700=y

CONFIG_PC_SYSFW=y

CONFIG_XEN_I386=$(CONFIG_XEN)

default-configs/ppc64-softmmu.mak

+0 −2
Original line number Diff line number Diff line
@@ -45,7 +45,5 @@ CONFIG_OPENPIC=y 
CONFIG_PSERIES=y

CONFIG_E500=y

CONFIG_OPENPIC_KVM=$(and $(CONFIG_E500),$(CONFIG_KVM))

# For pSeries

CONFIG_PCI_HOTPLUG=y

# For PReP

CONFIG_MC146818RTC=y

default-configs/x86_64-softmmu.mak

+1 −2
Original line number Diff line number Diff line
@@ -28,11 +28,10 @@ CONFIG_APPLESMC=y 
CONFIG_I8259=y

CONFIG_PFLASH_CFI01=y

CONFIG_TPM_TIS=$(CONFIG_TPM)

CONFIG_PCI_HOTPLUG=y

CONFIG_PCI_HOTPLUG_OLD=y

CONFIG_MC146818RTC=y

CONFIG_PAM=y

CONFIG_PCI_PIIX=y

CONFIG_PCI_HOTPLUG=y

CONFIG_WDT_IB700=y

CONFIG_PC_SYSFW=y

CONFIG_XEN_I386=$(CONFIG_XEN)

hmp-commands.hx

+2 −2
Original line number Diff line number Diff line
@@ -1077,7 +1077,7 @@ STEXI 
Add drive to PCI storage controller.

ETEXI



#if defined(TARGET_I386)

#if defined(CONFIG_PCI_HOTPLUG_OLD)

    {

        .name       = "pci_add",

        .args_type  = "pci_addr:s,type:s,opts:s?",
@@ -1093,7 +1093,7 @@ STEXI 
Hot-add PCI device.

ETEXI



#if defined(TARGET_I386)

#if defined(CONFIG_PCI_HOTPLUG_OLD)

    {

        .name       = "pci_del",

        .args_type  = "pci_addr:s",

hw/pci/Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -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