mirror of
https://github.com/qemu/qemu.git
synced 2024-12-11 20:53:51 +08:00
f51074cdc6
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 <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
82 lines
2.3 KiB
C
82 lines
2.3 KiB
C
/*
|
|
* QEMU device hotplug helpers
|
|
*
|
|
* Copyright (c) 2004 Fabrice Bellard
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include "hw/hw.h"
|
|
#include "hw/boards.h"
|
|
#include "sysemu/block-backend.h"
|
|
#include "sysemu/blockdev.h"
|
|
#include "qemu/config-file.h"
|
|
#include "sysemu/sysemu.h"
|
|
#include "monitor/monitor.h"
|
|
|
|
static DriveInfo *add_init_drive(const char *optstr)
|
|
{
|
|
DriveInfo *dinfo;
|
|
QemuOpts *opts;
|
|
MachineClass *mc;
|
|
|
|
opts = drive_def(optstr);
|
|
if (!opts)
|
|
return NULL;
|
|
|
|
mc = MACHINE_GET_CLASS(current_machine);
|
|
dinfo = drive_new(opts, mc->block_default_type);
|
|
if (!dinfo) {
|
|
qemu_opts_del(opts);
|
|
return NULL;
|
|
}
|
|
|
|
return dinfo;
|
|
}
|
|
|
|
void hmp_drive_add(Monitor *mon, const QDict *qdict)
|
|
{
|
|
DriveInfo *dinfo = NULL;
|
|
const char *opts = qdict_get_str(qdict, "opts");
|
|
|
|
dinfo = add_init_drive(opts);
|
|
if (!dinfo) {
|
|
goto err;
|
|
}
|
|
if (dinfo->devaddr) {
|
|
monitor_printf(mon, "Parameter addr not supported\n");
|
|
goto err;
|
|
}
|
|
|
|
switch (dinfo->type) {
|
|
case IF_NONE:
|
|
monitor_printf(mon, "OK\n");
|
|
break;
|
|
default:
|
|
monitor_printf(mon, "Can't hot-add drive to type %d\n", dinfo->type);
|
|
goto err;
|
|
}
|
|
return;
|
|
|
|
err:
|
|
if (dinfo) {
|
|
blk_unref(blk_by_legacy_dinfo(dinfo));
|
|
}
|
|
}
|