Commit f51074cd authored by Markus Armbruster's avatar Markus Armbruster Committed by Michael S. Tsirkin
Browse files

pci-hotplug-old: Has been dead for five major releases, bury 



Commit 79ca616f (v1.6.0) accidentally disabled legacy x86-only HMP
commands pci_add, pci_del: it defined CONFIG_PCI_HOTPLUG only as make
variable, not as preprocessor macro, killing the code conditional on
defined(CONFIG_PCI_HOTPLUG_OLD).

In all this time, nobody reported the loss.  I only noticed it when I
tried to test some error reporting change that forced me to touch this
old crap again.

Fun: git-log hw/pci/pci-hotplug-old.c shows our faith in the backward
compatibility god has been strong enough to sacrifice at its altar
about a dozen times, but not strong enough to even once verify the
legacy feature's still there, let alone works.

Remove the commands along with the code backing them.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 6dbcb819

default-configs/i386-softmmu.mak

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ CONFIG_APPLESMC=y 
CONFIG_I8259=y

CONFIG_PFLASH_CFI01=y

CONFIG_TPM_TIS=$(CONFIG_TPM)

CONFIG_PCI_HOTPLUG_OLD=y

CONFIG_MC146818RTC=y

CONFIG_PAM=y

CONFIG_PCI_PIIX=y

default-configs/x86_64-softmmu.mak

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ CONFIG_APPLESMC=y 
CONFIG_I8259=y

CONFIG_PFLASH_CFI01=y

CONFIG_TPM_TIS=$(CONFIG_TPM)

CONFIG_PCI_HOTPLUG_OLD=y

CONFIG_MC146818RTC=y

CONFIG_PAM=y

CONFIG_PCI_PIIX=y

device-hotplug.c

+3 −4
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include "sysemu/sysemu.h"

#include "monitor/monitor.h"



DriveInfo *add_init_drive(const char *optstr)

static DriveInfo *add_init_drive(const char *optstr)

{

    DriveInfo *dinfo;

    QemuOpts *opts;
@@ -69,10 +69,9 @@ void hmp_drive_add(Monitor *mon, const QDict *qdict) 
        monitor_printf(mon, "OK\n");

        break;

    default:

        if (pci_drive_hot_add(mon, qdict, dinfo)) {

        monitor_printf(mon, "Can't hot-add drive to type %d\n", dinfo->type);

        goto err;

    }

    }

    return;



err:

hmp-commands.hx

+0 −32
Original line number Diff line number Diff line
@@ -1147,38 +1147,6 @@ STEXI 
@item drive_add

@findex drive_add

Add drive to PCI storage controller.

ETEXI



#if defined(CONFIG_PCI_HOTPLUG_OLD)

    {

        .name       = "pci_add",

        .args_type  = "pci_addr:s,type:s,opts:s?",

        .params     = "auto|[[<domain>:]<bus>:]<slot> nic|storage [[vlan=n][,macaddr=addr][,model=type]] [file=file][,if=type][,bus=nr]...",

        .help       = "hot-add PCI device",

        .mhandler.cmd = hmp_pci_add,

    },

#endif



STEXI

@item pci_add

@findex pci_add

Hot-add PCI device.

ETEXI



#if defined(CONFIG_PCI_HOTPLUG_OLD)

    {

        .name       = "pci_del",

        .args_type  = "pci_addr:s",

        .params     = "[[<domain>:]<bus>:]<slot>",

        .help       = "hot remove PCI device",

        .mhandler.cmd = hmp_pci_del,

    },

#endif



STEXI

@item pci_del

@findex pci_del

Hot remove PCI device.

ETEXI



    {

hw/pci/Makefile.objs

+0 −2
Original line number Diff line number Diff line
@@ -7,5 +7,3 @@ common-obj-$(CONFIG_PCI) += pcie.o pcie_aer.o pcie_port.o 


common-obj-$(call lnot,$(CONFIG_PCI)) += pci-stub.o

common-obj-$(CONFIG_ALL) += pci-stub.o
 


common-obj-$(CONFIG_PCI_HOTPLUG_OLD) += pci-hotplug-old.o