From f51074cdc6e750daa3b6df727d83449a7e42b391 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 26 Feb 2015 17:21:13 +0100 Subject: pci-hotplug-old: Has been dead for five major releases, bury Commit 79ca616 (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: Markus Armbruster Reviewed-by: Eric Blake Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- device-hotplug.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'device-hotplug.c') diff --git a/device-hotplug.c b/device-hotplug.c index 833d8748d5..68b94967c5 100644 --- a/device-hotplug.c +++ b/device-hotplug.c @@ -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,9 +69,8 @@ void hmp_drive_add(Monitor *mon, const QDict *qdict) monitor_printf(mon, "OK\n"); break; default: - if (pci_drive_hot_add(mon, qdict, dinfo)) { - goto err; - } + monitor_printf(mon, "Can't hot-add drive to type %d\n", dinfo->type); + goto err; } return; -- cgit v1.2.3