mirror of
https://github.com/qemu/qemu.git
synced 2024-11-25 20:03:37 +08:00
dd97aa8adc
The monitor command for hotplugging is in i386 specific code. This is just plain wrong, as S390 just learned how to do hotplugging too and needs to get drives for that. So let's add a generic copy to generic code that handles drive_add in a way that doesn't have pci dependencies. All pci specific code can then be handled in a pci specific function. Signed-off-by: Alexander Graf <agraf@suse.de> --- v1 -> v2: - align generic drive_add to pci specific one - rework to split between generic and pci code v2 -> v3: - remove comment
94 lines
2.5 KiB
C
94 lines
2.5 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.h"
|
|
#include "boards.h"
|
|
#include "net.h"
|
|
#include "blockdev.h"
|
|
#include "qemu-config.h"
|
|
#include "sysemu.h"
|
|
#include "monitor.h"
|
|
|
|
DriveInfo *add_init_drive(const char *optstr)
|
|
{
|
|
DriveInfo *dinfo;
|
|
QemuOpts *opts;
|
|
|
|
opts = drive_def(optstr);
|
|
if (!opts)
|
|
return NULL;
|
|
|
|
dinfo = drive_init(opts, current_machine->use_scsi);
|
|
if (!dinfo) {
|
|
qemu_opts_del(opts);
|
|
return NULL;
|
|
}
|
|
|
|
return dinfo;
|
|
}
|
|
|
|
#if !defined(TARGET_I386)
|
|
int pci_drive_hot_add(Monitor *mon, const QDict *qdict,
|
|
DriveInfo *dinfo, int type)
|
|
{
|
|
/* On non-x86 we don't do PCI hotplug */
|
|
monitor_printf(mon, "Can't hot-add drive to type %d\n", type);
|
|
return -1;
|
|
}
|
|
#endif
|
|
|
|
void drive_hot_add(Monitor *mon, const QDict *qdict)
|
|
{
|
|
int type;
|
|
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;
|
|
}
|
|
type = dinfo->type;
|
|
|
|
switch (type) {
|
|
case IF_NONE:
|
|
monitor_printf(mon, "OK\n");
|
|
break;
|
|
default:
|
|
if (pci_drive_hot_add(mon, qdict, dinfo, type)) {
|
|
goto err;
|
|
}
|
|
}
|
|
return;
|
|
|
|
err:
|
|
if (dinfo) {
|
|
drive_put_ref(dinfo);
|
|
}
|
|
return;
|
|
}
|