If the user issues one of the following commands to the Monitor: pci_add pci_addr=auto nic model=None pci_add pci_addr=auto nic model=? QEMU will exit, because the function used to perform sanity checks (qemu_check_nic_model_list()) exits on error. This function is used by the startup code, where it makes sense to exit on error, but in the Monitor it doesn't. Changing qemu_check_nic_model_list() to not exit on error is not possible though, as it's used by the board init code (the PC one), where all board specific code must have void return. The way I've chosen to fix this was to introduce a new function called pci_nic_supported(), which checks if the NIC is supported and returns true or false accordingly. The new function is used only by the Monitor, it performs the necessary check and returns an error in case the NIC is not supported, thus qemu_check_nic_model_list()'s exit is never trigged. The following should be observed: 1. Only the specified NIC is checked, the default one is assumed to be supported 2. The NIC query command (model=?) won't work with pci_add, the right way to do this with the Monitor is to add a new command Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
257 lines
6.9 KiB
C
257 lines
6.9 KiB
C
/*
|
|
* QEMU PCI hotplug support
|
|
*
|
|
* 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 "pci.h"
|
|
#include "net.h"
|
|
#include "sysemu.h"
|
|
#include "pc.h"
|
|
#include "monitor.h"
|
|
#include "block_int.h"
|
|
#include "scsi-disk.h"
|
|
#include "virtio-blk.h"
|
|
|
|
#if defined(TARGET_I386) || defined(TARGET_X86_64)
|
|
static PCIDevice *qemu_pci_hot_add_nic(Monitor *mon,
|
|
const char *devaddr, const char *opts)
|
|
{
|
|
int ret;
|
|
|
|
ret = net_client_init(mon, "nic", opts);
|
|
if (ret < 0)
|
|
return NULL;
|
|
if (nd_table[ret].devaddr) {
|
|
monitor_printf(mon, "Parameter addr not supported\n");
|
|
return NULL;
|
|
}
|
|
|
|
if (nd_table[ret].model && !pci_nic_supported(nd_table[ret].model))
|
|
return NULL;
|
|
|
|
return pci_nic_init(&nd_table[ret], "rtl8139", devaddr);
|
|
}
|
|
|
|
void drive_hot_add(Monitor *mon, const QDict *qdict)
|
|
{
|
|
int dom, pci_bus;
|
|
unsigned slot;
|
|
int type, bus;
|
|
int success = 0;
|
|
PCIDevice *dev;
|
|
DriveInfo *dinfo;
|
|
const char *pci_addr = qdict_get_str(qdict, "pci_addr");
|
|
const char *opts = qdict_get_str(qdict, "opts");
|
|
BusState *scsibus;
|
|
|
|
if (pci_read_devaddr(mon, pci_addr, &dom, &pci_bus, &slot)) {
|
|
return;
|
|
}
|
|
|
|
dev = pci_find_device(pci_bus, slot, 0);
|
|
if (!dev) {
|
|
monitor_printf(mon, "no pci device with address %s\n", pci_addr);
|
|
return;
|
|
}
|
|
|
|
dinfo = add_init_drive(opts);
|
|
if (!dinfo)
|
|
return;
|
|
if (dinfo->devaddr) {
|
|
monitor_printf(mon, "Parameter addr not supported\n");
|
|
return;
|
|
}
|
|
type = dinfo->type;
|
|
bus = drive_get_max_bus (type);
|
|
|
|
switch (type) {
|
|
case IF_SCSI:
|
|
success = 1;
|
|
scsibus = QLIST_FIRST(&dev->qdev.child_bus);
|
|
scsi_bus_legacy_add_drive(DO_UPCAST(SCSIBus, qbus, scsibus),
|
|
dinfo, dinfo->unit);
|
|
break;
|
|
default:
|
|
monitor_printf(mon, "Can't hot-add drive to type %d\n", type);
|
|
}
|
|
|
|
if (success)
|
|
monitor_printf(mon, "OK bus %d, unit %d\n",
|
|
dinfo->bus,
|
|
dinfo->unit);
|
|
return;
|
|
}
|
|
|
|
static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon,
|
|
const char *devaddr,
|
|
const char *opts)
|
|
{
|
|
PCIDevice *dev;
|
|
DriveInfo *dinfo = NULL;
|
|
int type = -1;
|
|
char buf[128];
|
|
|
|
if (get_param_value(buf, sizeof(buf), "if", opts)) {
|
|
if (!strcmp(buf, "scsi"))
|
|
type = IF_SCSI;
|
|
else if (!strcmp(buf, "virtio")) {
|
|
type = IF_VIRTIO;
|
|
} else {
|
|
monitor_printf(mon, "type %s not a hotpluggable PCI device.\n", buf);
|
|
return NULL;
|
|
}
|
|
} else {
|
|
monitor_printf(mon, "no if= specified\n");
|
|
return NULL;
|
|
}
|
|
|
|
if (get_param_value(buf, sizeof(buf), "file", opts)) {
|
|
dinfo = add_init_drive(opts);
|
|
if (!dinfo)
|
|
return NULL;
|
|
if (dinfo->devaddr) {
|
|
monitor_printf(mon, "Parameter addr not supported\n");
|
|
return NULL;
|
|
}
|
|
} else {
|
|
dinfo = NULL;
|
|
}
|
|
|
|
switch (type) {
|
|
case IF_SCSI:
|
|
dev = pci_create("lsi53c895a", devaddr);
|
|
break;
|
|
case IF_VIRTIO:
|
|
if (!dinfo) {
|
|
monitor_printf(mon, "virtio requires a backing file/device.\n");
|
|
return NULL;
|
|
}
|
|
dev = pci_create("virtio-blk-pci", devaddr);
|
|
qdev_prop_set_drive(&dev->qdev, "drive", dinfo);
|
|
break;
|
|
default:
|
|
dev = NULL;
|
|
}
|
|
if (dev)
|
|
qdev_init(&dev->qdev);
|
|
return dev;
|
|
}
|
|
|
|
void pci_device_hot_add(Monitor *mon, const QDict *qdict)
|
|
{
|
|
PCIDevice *dev = NULL;
|
|
const char *pci_addr = qdict_get_str(qdict, "pci_addr");
|
|
const char *type = qdict_get_str(qdict, "type");
|
|
const char *opts = qdict_get_try_str(qdict, "opts");
|
|
|
|
/* strip legacy tag */
|
|
if (!strncmp(pci_addr, "pci_addr=", 9)) {
|
|
pci_addr += 9;
|
|
}
|
|
|
|
if (!opts) {
|
|
opts = "";
|
|
}
|
|
|
|
if (!strcmp(pci_addr, "auto"))
|
|
pci_addr = NULL;
|
|
|
|
if (strcmp(type, "nic") == 0)
|
|
dev = qemu_pci_hot_add_nic(mon, pci_addr, opts);
|
|
else if (strcmp(type, "storage") == 0)
|
|
dev = qemu_pci_hot_add_storage(mon, pci_addr, opts);
|
|
else
|
|
monitor_printf(mon, "invalid type: %s\n", type);
|
|
|
|
if (dev) {
|
|
qemu_system_device_hot_add(pci_bus_num(dev->bus),
|
|
PCI_SLOT(dev->devfn), 1);
|
|
monitor_printf(mon, "OK domain %d, bus %d, slot %d, function %d\n",
|
|
0, pci_bus_num(dev->bus), PCI_SLOT(dev->devfn),
|
|
PCI_FUNC(dev->devfn));
|
|
} else
|
|
monitor_printf(mon, "failed to add %s\n", opts);
|
|
}
|
|
#endif
|
|
|
|
void pci_device_hot_remove(Monitor *mon, const char *pci_addr)
|
|
{
|
|
PCIDevice *d;
|
|
int dom, bus;
|
|
unsigned slot;
|
|
|
|
if (pci_read_devaddr(mon, pci_addr, &dom, &bus, &slot)) {
|
|
return;
|
|
}
|
|
|
|
d = pci_find_device(bus, slot, 0);
|
|
if (!d) {
|
|
monitor_printf(mon, "slot %d empty\n", slot);
|
|
return;
|
|
}
|
|
|
|
qemu_system_device_hot_add(bus, slot, 0);
|
|
}
|
|
|
|
void do_pci_device_hot_remove(Monitor *mon, const QDict *qdict)
|
|
{
|
|
pci_device_hot_remove(mon, qdict_get_str(qdict, "pci_addr"));
|
|
}
|
|
|
|
static int pci_match_fn(void *dev_private, void *arg)
|
|
{
|
|
PCIDevice *dev = dev_private;
|
|
PCIDevice *match = arg;
|
|
|
|
return (dev == match);
|
|
}
|
|
|
|
/*
|
|
* OS has executed _EJ0 method, we now can remove the device
|
|
*/
|
|
void pci_device_hot_remove_success(int pcibus, int slot)
|
|
{
|
|
PCIDevice *d = pci_find_device(pcibus, slot, 0);
|
|
int class_code;
|
|
|
|
if (!d) {
|
|
monitor_printf(cur_mon, "invalid slot %d\n", slot);
|
|
return;
|
|
}
|
|
|
|
class_code = d->config_read(d, PCI_CLASS_DEVICE+1, 1);
|
|
|
|
switch(class_code) {
|
|
case PCI_BASE_CLASS_STORAGE:
|
|
destroy_bdrvs(pci_match_fn, d);
|
|
break;
|
|
case PCI_BASE_CLASS_NETWORK:
|
|
destroy_nic(pci_match_fn, d);
|
|
break;
|
|
}
|
|
|
|
pci_unregister_device(d);
|
|
}
|
|
|