2009-02-11 18:21:54 +03:00
|
|
|
/*
|
|
|
|
* 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"
|
2009-03-06 02:01:23 +03:00
|
|
|
#include "monitor.h"
|
2009-02-11 18:21:54 +03:00
|
|
|
#include "block_int.h"
|
2009-10-30 11:54:00 +03:00
|
|
|
#include "scsi.h"
|
2009-02-11 18:21:54 +03:00
|
|
|
#include "virtio-blk.h"
|
2009-10-06 15:17:15 +04:00
|
|
|
#include "qemu-config.h"
|
2009-02-11 18:21:54 +03:00
|
|
|
|
2009-10-08 02:00:00 +04:00
|
|
|
#if defined(TARGET_I386)
|
2009-06-18 17:14:09 +04:00
|
|
|
static PCIDevice *qemu_pci_hot_add_nic(Monitor *mon,
|
2009-10-06 15:17:15 +04:00
|
|
|
const char *devaddr,
|
|
|
|
const char *opts_str)
|
2009-02-11 18:21:54 +03:00
|
|
|
{
|
2009-10-06 15:17:15 +04:00
|
|
|
QemuOpts *opts;
|
2009-12-10 13:11:05 +03:00
|
|
|
PCIBus *bus;
|
|
|
|
int ret, devfn;
|
|
|
|
|
|
|
|
bus = pci_get_bus_devfn(&devfn, devaddr);
|
|
|
|
if (!bus) {
|
|
|
|
monitor_printf(mon, "Invalid PCI device address %s\n", devaddr);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
if (!((BusState*)bus)->allow_hotplug) {
|
|
|
|
monitor_printf(mon, "PCI bus doesn't support hotplug\n");
|
|
|
|
return NULL;
|
|
|
|
}
|
2009-02-11 18:21:54 +03:00
|
|
|
|
2010-02-10 21:52:18 +03:00
|
|
|
opts = qemu_opts_parse(&qemu_net_opts, opts_str ? opts_str : "", 0);
|
2009-10-06 15:17:15 +04:00
|
|
|
if (!opts) {
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
qemu_opt_set(opts, "type", "nic");
|
|
|
|
|
2009-10-08 22:58:27 +04:00
|
|
|
ret = net_client_init(mon, opts, 0);
|
2009-04-17 21:10:47 +04:00
|
|
|
if (ret < 0)
|
2009-02-11 18:21:54 +03:00
|
|
|
return NULL;
|
2009-06-18 17:14:08 +04:00
|
|
|
if (nd_table[ret].devaddr) {
|
|
|
|
monitor_printf(mon, "Parameter addr not supported\n");
|
|
|
|
return NULL;
|
|
|
|
}
|
2009-06-18 17:14:09 +04:00
|
|
|
return pci_nic_init(&nd_table[ret], "rtl8139", devaddr);
|
2009-02-11 18:21:54 +03:00
|
|
|
}
|
|
|
|
|
2010-02-18 20:41:52 +03:00
|
|
|
static int scsi_hot_add(Monitor *mon, DeviceState *adapter,
|
|
|
|
DriveInfo *dinfo, int printinfo)
|
2009-10-14 17:30:22 +04:00
|
|
|
{
|
|
|
|
SCSIBus *scsibus;
|
|
|
|
SCSIDevice *scsidev;
|
|
|
|
|
|
|
|
scsibus = DO_UPCAST(SCSIBus, qbus, QLIST_FIRST(&adapter->child_bus));
|
|
|
|
if (!scsibus || strcmp(scsibus->qbus.info->name, "SCSI") != 0) {
|
2010-02-18 19:25:24 +03:00
|
|
|
error_report("Device is not a SCSI adapter");
|
2009-10-14 17:30:22 +04:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* drive_init() tries to find a default for dinfo->unit. Doesn't
|
|
|
|
* work at all for hotplug though as we assign the device to a
|
|
|
|
* specific bus instead of the first bus with spare scsi ids.
|
|
|
|
*
|
|
|
|
* Ditch the calculated value and reload from option string (if
|
|
|
|
* specified).
|
|
|
|
*/
|
|
|
|
dinfo->unit = qemu_opt_get_number(dinfo->opts, "unit", -1);
|
|
|
|
scsidev = scsi_bus_legacy_add_drive(scsibus, dinfo, dinfo->unit);
|
2009-12-10 13:11:07 +03:00
|
|
|
dinfo->unit = scsidev->id;
|
2009-10-14 17:30:22 +04:00
|
|
|
|
|
|
|
if (printinfo)
|
2010-02-18 20:41:52 +03:00
|
|
|
monitor_printf(mon, "OK bus %d, unit %d\n",
|
|
|
|
scsibus->busnr, scsidev->id);
|
2009-10-14 17:30:22 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2009-08-28 22:27:14 +04:00
|
|
|
void drive_hot_add(Monitor *mon, const QDict *qdict)
|
2009-02-11 18:21:54 +03:00
|
|
|
{
|
|
|
|
int dom, pci_bus;
|
|
|
|
unsigned slot;
|
2010-04-25 22:58:25 +04:00
|
|
|
int type;
|
2009-02-11 18:21:54 +03:00
|
|
|
PCIDevice *dev;
|
2009-09-25 23:42:47 +04:00
|
|
|
DriveInfo *dinfo = NULL;
|
2009-08-28 22:27:14 +04:00
|
|
|
const char *pci_addr = qdict_get_str(qdict, "pci_addr");
|
|
|
|
const char *opts = qdict_get_str(qdict, "opts");
|
2009-02-11 18:21:54 +03:00
|
|
|
|
2009-07-22 18:42:57 +04:00
|
|
|
dinfo = add_init_drive(opts);
|
|
|
|
if (!dinfo)
|
2009-09-25 23:42:47 +04:00
|
|
|
goto err;
|
2009-07-22 18:42:57 +04:00
|
|
|
if (dinfo->devaddr) {
|
2009-06-18 17:14:10 +04:00
|
|
|
monitor_printf(mon, "Parameter addr not supported\n");
|
2009-09-25 23:42:47 +04:00
|
|
|
goto err;
|
2009-06-18 17:14:10 +04:00
|
|
|
}
|
2009-07-22 18:42:57 +04:00
|
|
|
type = dinfo->type;
|
2009-02-11 18:21:54 +03:00
|
|
|
|
|
|
|
switch (type) {
|
|
|
|
case IF_SCSI:
|
2009-09-25 23:42:47 +04:00
|
|
|
if (pci_read_devaddr(mon, pci_addr, &dom, &pci_bus, &slot)) {
|
|
|
|
goto err;
|
|
|
|
}
|
2010-05-28 13:30:46 +04:00
|
|
|
dev = pci_find_device(pci_find_root_bus(dom), pci_bus, slot, 0);
|
2009-09-25 23:42:47 +04:00
|
|
|
if (!dev) {
|
|
|
|
monitor_printf(mon, "no pci device with address %s\n", pci_addr);
|
|
|
|
goto err;
|
|
|
|
}
|
2010-02-18 20:41:52 +03:00
|
|
|
if (scsi_hot_add(mon, &dev->qdev, dinfo, 1) != 0) {
|
2009-10-14 17:30:22 +04:00
|
|
|
goto err;
|
|
|
|
}
|
2009-02-11 18:21:54 +03:00
|
|
|
break;
|
2009-09-25 23:42:48 +04:00
|
|
|
case IF_NONE:
|
|
|
|
monitor_printf(mon, "OK\n");
|
|
|
|
break;
|
2009-02-11 18:21:54 +03:00
|
|
|
default:
|
2009-03-06 02:01:23 +03:00
|
|
|
monitor_printf(mon, "Can't hot-add drive to type %d\n", type);
|
2009-09-25 23:42:47 +04:00
|
|
|
goto err;
|
2009-02-11 18:21:54 +03:00
|
|
|
}
|
2009-09-25 23:42:47 +04:00
|
|
|
return;
|
2009-02-11 18:21:54 +03:00
|
|
|
|
2009-09-25 23:42:47 +04:00
|
|
|
err:
|
|
|
|
if (dinfo)
|
|
|
|
drive_uninit(dinfo);
|
2009-02-11 18:21:54 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2009-06-18 17:14:09 +04:00
|
|
|
static PCIDevice *qemu_pci_hot_add_storage(Monitor *mon,
|
|
|
|
const char *devaddr,
|
2009-03-06 02:01:23 +03:00
|
|
|
const char *opts)
|
2009-02-11 18:21:54 +03:00
|
|
|
{
|
2009-06-18 17:14:09 +04:00
|
|
|
PCIDevice *dev;
|
2009-08-16 16:07:54 +04:00
|
|
|
DriveInfo *dinfo = NULL;
|
2009-07-22 18:42:57 +04:00
|
|
|
int type = -1;
|
2009-02-11 18:21:54 +03:00
|
|
|
char buf[128];
|
2009-09-25 05:53:49 +04:00
|
|
|
PCIBus *bus;
|
|
|
|
int devfn;
|
2009-02-11 18:21:54 +03:00
|
|
|
|
|
|
|
if (get_param_value(buf, sizeof(buf), "if", opts)) {
|
|
|
|
if (!strcmp(buf, "scsi"))
|
|
|
|
type = IF_SCSI;
|
|
|
|
else if (!strcmp(buf, "virtio")) {
|
|
|
|
type = IF_VIRTIO;
|
2009-04-05 21:40:55 +04:00
|
|
|
} else {
|
|
|
|
monitor_printf(mon, "type %s not a hotpluggable PCI device.\n", buf);
|
2009-06-18 17:14:09 +04:00
|
|
|
return NULL;
|
2009-02-11 18:21:54 +03:00
|
|
|
}
|
|
|
|
} else {
|
2009-03-06 02:01:23 +03:00
|
|
|
monitor_printf(mon, "no if= specified\n");
|
2009-06-18 17:14:09 +04:00
|
|
|
return NULL;
|
2009-02-11 18:21:54 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
if (get_param_value(buf, sizeof(buf), "file", opts)) {
|
2009-07-22 18:42:57 +04:00
|
|
|
dinfo = add_init_drive(opts);
|
|
|
|
if (!dinfo)
|
2009-06-18 17:14:09 +04:00
|
|
|
return NULL;
|
2009-07-22 18:42:57 +04:00
|
|
|
if (dinfo->devaddr) {
|
2009-06-18 17:14:10 +04:00
|
|
|
monitor_printf(mon, "Parameter addr not supported\n");
|
|
|
|
return NULL;
|
|
|
|
}
|
2009-08-23 10:12:54 +04:00
|
|
|
} else {
|
|
|
|
dinfo = NULL;
|
2009-02-11 18:21:54 +03:00
|
|
|
}
|
|
|
|
|
2009-09-25 05:53:49 +04:00
|
|
|
bus = pci_get_bus_devfn(&devfn, devaddr);
|
|
|
|
if (!bus) {
|
|
|
|
monitor_printf(mon, "Invalid PCI device address %s\n", devaddr);
|
|
|
|
return NULL;
|
|
|
|
}
|
2009-12-10 13:11:05 +03:00
|
|
|
if (!((BusState*)bus)->allow_hotplug) {
|
|
|
|
monitor_printf(mon, "PCI bus doesn't support hotplug\n");
|
|
|
|
return NULL;
|
|
|
|
}
|
2009-09-25 05:53:49 +04:00
|
|
|
|
2009-02-11 18:21:54 +03:00
|
|
|
switch (type) {
|
|
|
|
case IF_SCSI:
|
2009-09-25 05:53:53 +04:00
|
|
|
dev = pci_create(bus, devfn, "lsi53c895a");
|
2009-10-13 15:59:55 +04:00
|
|
|
if (qdev_init(&dev->qdev) < 0)
|
|
|
|
dev = NULL;
|
2009-12-07 23:51:49 +03:00
|
|
|
if (dev && dinfo) {
|
2010-02-18 20:41:52 +03:00
|
|
|
if (scsi_hot_add(mon, &dev->qdev, dinfo, 0) != 0) {
|
2009-10-14 17:30:22 +04:00
|
|
|
qdev_unplug(&dev->qdev);
|
|
|
|
dev = NULL;
|
|
|
|
}
|
2009-10-13 15:59:55 +04:00
|
|
|
}
|
2009-02-11 18:21:54 +03:00
|
|
|
break;
|
|
|
|
case IF_VIRTIO:
|
2009-08-23 10:12:54 +04:00
|
|
|
if (!dinfo) {
|
|
|
|
monitor_printf(mon, "virtio requires a backing file/device.\n");
|
|
|
|
return NULL;
|
|
|
|
}
|
2009-09-25 05:53:53 +04:00
|
|
|
dev = pci_create(bus, devfn, "virtio-blk-pci");
|
qdev-ify virtio-blk.
First user of the new drive property. With this patch applied host
and guest config can be specified separately, like this:
-drive if=none,id=disk1,file=/path/to/disk.img
-device virtio-blk-pci,drive=disk1
You can set any property for virtio-blk-pci now. You can set the pci
address via addr=. You can switch the device into 0.10 compat mode
using class=0x0180. As this is per device you can have one 0.10 and one
0.11 virtio block device in a single virtual machine.
Old syntax continues to work. Internally it does the same as the two
lines above though. One side effect this has is a different
initialization order, which might result in a different pci address
being assigned by default.
Long term plan here is to have this working for all block devices, i.e.
once all scsi is properly qdev-ified you will be able to do something
like this:
-drive if=none,id=sda,file=/path/to/disk.img
-device lsi,id=lsi,addr=<pciaddr>
-device scsi-disk,drive=sda,bus=lsi.0,lun=<n>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:
2009-07-31 14:25:41 +04:00
|
|
|
qdev_prop_set_drive(&dev->qdev, "drive", dinfo);
|
2009-10-13 15:59:55 +04:00
|
|
|
if (qdev_init(&dev->qdev) < 0)
|
|
|
|
dev = NULL;
|
2009-02-11 18:21:54 +03:00
|
|
|
break;
|
2009-06-18 17:14:09 +04:00
|
|
|
default:
|
|
|
|
dev = NULL;
|
2009-02-11 18:21:54 +03:00
|
|
|
}
|
2009-06-18 17:14:09 +04:00
|
|
|
return dev;
|
2009-02-11 18:21:54 +03:00
|
|
|
}
|
|
|
|
|
2010-05-12 12:53:00 +04:00
|
|
|
void pci_device_hot_add(Monitor *mon, const QDict *qdict)
|
2009-02-11 18:21:54 +03:00
|
|
|
{
|
|
|
|
PCIDevice *dev = NULL;
|
2009-08-28 22:27:15 +04:00
|
|
|
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");
|
2009-02-11 18:21:54 +03:00
|
|
|
|
2009-06-26 02:04:00 +04:00
|
|
|
/* strip legacy tag */
|
|
|
|
if (!strncmp(pci_addr, "pci_addr=", 9)) {
|
|
|
|
pci_addr += 9;
|
2009-02-11 18:21:54 +03:00
|
|
|
}
|
|
|
|
|
2009-06-26 02:04:10 +04:00
|
|
|
if (!opts) {
|
|
|
|
opts = "";
|
|
|
|
}
|
|
|
|
|
2009-06-26 02:04:00 +04:00
|
|
|
if (!strcmp(pci_addr, "auto"))
|
|
|
|
pci_addr = NULL;
|
2009-02-11 18:21:54 +03:00
|
|
|
|
2010-02-11 04:49:55 +03:00
|
|
|
if (strcmp(type, "nic") == 0) {
|
2009-06-26 02:04:00 +04:00
|
|
|
dev = qemu_pci_hot_add_nic(mon, pci_addr, opts);
|
2010-02-11 04:49:55 +03:00
|
|
|
} else if (strcmp(type, "storage") == 0) {
|
2009-06-26 02:04:00 +04:00
|
|
|
dev = qemu_pci_hot_add_storage(mon, pci_addr, opts);
|
2010-02-11 04:49:55 +03:00
|
|
|
} else {
|
2009-03-06 02:01:23 +03:00
|
|
|
monitor_printf(mon, "invalid type: %s\n", type);
|
2010-02-11 04:49:55 +03:00
|
|
|
}
|
2009-02-11 18:21:54 +03:00
|
|
|
|
|
|
|
if (dev) {
|
2010-05-12 12:53:00 +04:00
|
|
|
monitor_printf(mon, "OK domain %d, bus %d, slot %d, function %d\n",
|
2010-05-28 13:30:46 +04:00
|
|
|
pci_find_domain(dev->bus),
|
|
|
|
pci_bus_num(dev->bus), PCI_SLOT(dev->devfn),
|
2010-05-12 12:53:00 +04:00
|
|
|
PCI_FUNC(dev->devfn));
|
|
|
|
} else
|
2009-03-06 02:01:23 +03:00
|
|
|
monitor_printf(mon, "failed to add %s\n", opts);
|
2009-02-11 18:21:54 +03:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2010-02-11 04:49:56 +03:00
|
|
|
int pci_device_hot_remove(Monitor *mon, const char *pci_addr)
|
2009-02-11 18:21:54 +03:00
|
|
|
{
|
|
|
|
PCIDevice *d;
|
|
|
|
int dom, bus;
|
|
|
|
unsigned slot;
|
|
|
|
|
2009-06-26 02:04:00 +04:00
|
|
|
if (pci_read_devaddr(mon, pci_addr, &dom, &bus, &slot)) {
|
2010-02-11 04:49:56 +03:00
|
|
|
return -1;
|
2009-02-11 18:21:54 +03:00
|
|
|
}
|
|
|
|
|
2010-05-28 13:30:46 +04:00
|
|
|
d = pci_find_device(pci_find_root_bus(dom), bus, slot, 0);
|
2009-02-11 18:21:54 +03:00
|
|
|
if (!d) {
|
2009-03-06 02:01:23 +03:00
|
|
|
monitor_printf(mon, "slot %d empty\n", slot);
|
2010-02-11 04:49:56 +03:00
|
|
|
return -1;
|
2009-02-11 18:21:54 +03:00
|
|
|
}
|
2010-02-11 04:49:56 +03:00
|
|
|
return qdev_unplug(&d->qdev);
|
2009-02-11 18:21:54 +03:00
|
|
|
}
|
|
|
|
|
2010-05-12 12:53:01 +04:00
|
|
|
void do_pci_device_hot_remove(Monitor *mon, const QDict *qdict)
|
2009-08-28 22:27:08 +04:00
|
|
|
{
|
2010-05-12 12:53:01 +04:00
|
|
|
pci_device_hot_remove(mon, qdict_get_str(qdict, "pci_addr"));
|
2009-08-28 22:27:08 +04:00
|
|
|
}
|