d176c495b6
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:
238 lines
6.3 KiB
C
238 lines
6.3 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 "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;
|
|
}
|
|
return pci_nic_init(&nd_table[ret], "rtl8139", devaddr);
|
|
}
|
|
|
|
void drive_hot_add(Monitor *mon, const char *pci_addr, const char *opts)
|
|
{
|
|
int dom, pci_bus;
|
|
unsigned slot;
|
|
int type, bus;
|
|
int success = 0;
|
|
PCIDevice *dev;
|
|
DriveInfo *dinfo;
|
|
|
|
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;
|
|
lsi_scsi_attach(&dev->qdev, dinfo->bdrv,
|
|
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;
|
|
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 if (type == IF_VIRTIO) {
|
|
monitor_printf(mon, "virtio requires a backing file/device.\n");
|
|
return NULL;
|
|
}
|
|
|
|
switch (type) {
|
|
case IF_SCSI:
|
|
dev = pci_create("lsi53c895a", devaddr);
|
|
break;
|
|
case IF_VIRTIO:
|
|
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 char *pci_addr, const char *type,
|
|
const char *opts)
|
|
{
|
|
PCIDevice *dev = NULL;
|
|
|
|
/* 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);
|
|
}
|
|
|
|
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);
|
|
}
|
|
|