On Fri, Oct 17, 2008 at 11:05:50AM +0100, Daniel P. Berrange wrote:
> On Fri, Oct 17, 2008 at 09:48:58AM +0200, Guido G?nther wrote:
> > Hi,
> > recent kvm allows to hot add scsi/virtio disks, it uses pci hotplugging
> > for that. Attached patch adds support for this to libvirt.
>
> Great, I didn't know SCSI allowed hotplug in QEMU.
Even NICs are hot pluggable now. And since qemu prints a reasonable OK
message we can parse the PCI slot number from the reply which allows for
unplugging as well (delayed that since I'm a bit short on time).
My patch contained a tiny error:
-+ safe_path = qemudEscapeShellArg(dev->data.disk->src);
++ safe_path = qemudEscapeMonitorArg(dev->data.disk->src);
corrected version attached,
-- Guido
>From 904973f9e740dd355aeb97e06f5b392193114107 Mon Sep 17 00:00:00 2001
From: Guido Guenther <agx@xxxxxxxxxxx>
Date: Thu, 16 Oct 2008 18:15:04 +0200
Subject: [PATCH] qemu: add support for virtio & scsi disk hotplugging
---
src/qemu_driver.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 91 insertions(+), 9 deletions(-)
diff --git a/src/qemu_driver.c b/src/qemu_driver.c
index a86b787..af25d07 100644
--- a/src/qemu_driver.c
+++ b/src/qemu_driver.c
@@ -2503,6 +2503,75 @@ static int qemudDomainChangeEjectableMedia(virDomainPtr dom,
return 0;
}
+static int qemudDomainAttachDiskDevice(virDomainPtr dom, virDomainDeviceDefPtr dev)
+{
+ struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData;
+ virDomainObjPtr vm = virDomainFindByUUID(&driver->domains, dom->uuid);
+ int ret, i;
+ char *cmd, *reply;
+ char *safe_path;
+ const char* type = virDomainDiskBusTypeToString(dev->data.disk->bus);
+
+ if (!vm) {
+ qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN,
+ "%s", _("no domain with matching uuid"));
+ return -1;
+ }
+
+ for (i = 0 ; i < vm->def->ndisks ; i++) {
+ if (STREQ(vm->def->disks[i]->dst, dev->data.disk->dst)) {
+ qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED,
+ _("target %s already exists"), dev->data.disk->dst);
+ return -1;
+ }
+ }
+
+ if (VIR_REALLOC_N(vm->def->disks, vm->def->ndisks+1) < 0) {
+ qemudReportError(dom->conn, NULL, NULL, VIR_ERR_NO_MEMORY, NULL);
+ return -1;
+ }
+
+ safe_path = qemudEscapeMonitorArg(dev->data.disk->src);
+ if (!safe_path) {
+ qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED,
+ "%s", _("out of memory"));
+ return -1;
+ }
+
+ ret = asprintf(&cmd, "pci_add 0 storage file=%s,if=%s",
+ safe_path, type);
+ VIR_FREE(safe_path);
+ if (ret == -1) {
+ qemudReportError(dom->conn, NULL, NULL, VIR_ERR_NO_MEMORY, NULL);
+ return ret;
+ }
+
+ if (qemudMonitorCommand(driver, vm, cmd, &reply) < 0) {
+ qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED,
+ _("cannot attach %s disk"), type);
+ VIR_FREE(cmd);
+ return -1;
+ }
+
+ DEBUG ("pci_add reply: %s", reply);
+ /* If the command succeeds qemu prints:
+ * OK bus 0... */
+ if (!strstr(reply, "OK bus 0")) {
+ qemudReportError (dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED,
+ _("adding %s disk failed"), type);
+ VIR_FREE(reply);
+ VIR_FREE(cmd);
+ return -1;
+ }
+
+ vm->def->disks[vm->def->ndisks++] = dev->data.disk;
+ qsort(vm->def->disks, vm->def->ndisks, sizeof(*vm->def->disks),
+ virDomainDiskQSort);
+
+ VIR_FREE(reply);
+ VIR_FREE(cmd);
+ return 0;
+}
static int qemudDomainAttachUsbMassstorageDevice(virDomainPtr dom, virDomainDeviceDefPtr dev)
{
@@ -2618,7 +2687,7 @@ static int qemudDomainAttachDevice(virDomainPtr dom,
struct qemud_driver *driver = (struct qemud_driver *)dom->conn->privateData;
virDomainObjPtr vm = virDomainFindByUUID(&driver->domains, dom->uuid);
virDomainDeviceDefPtr dev;
- int ret = 0;
+ int ret = 0, supported = 0;
if (!vm) {
qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN,
@@ -2637,19 +2706,32 @@ static int qemudDomainAttachDevice(virDomainPtr dom,
return -1;
}
- if (dev->type == VIR_DOMAIN_DEVICE_DISK &&
- (dev->data.disk->device == VIR_DOMAIN_DISK_DEVICE_CDROM ||
- dev->data.disk->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY)) {
+ if (dev->type == VIR_DOMAIN_DEVICE_DISK) {
+ switch (dev->data.disk->device) {
+ case VIR_DOMAIN_DISK_DEVICE_CDROM:
+ case VIR_DOMAIN_DISK_DEVICE_FLOPPY:
+ supported = 1;
ret = qemudDomainChangeEjectableMedia(dom, dev);
- } else if (dev->type == VIR_DOMAIN_DEVICE_DISK &&
- dev->data.disk->device == VIR_DOMAIN_DISK_DEVICE_DISK &&
- dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_USB) {
- ret = qemudDomainAttachUsbMassstorageDevice(dom, dev);
+ break;
+ case VIR_DOMAIN_DISK_DEVICE_DISK:
+ if (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_USB) {
+ supported = 1;
+ ret = qemudDomainAttachUsbMassstorageDevice(dom, dev);
+ } else if (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_SCSI ||
+ dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_VIRTIO) {
+ supported = 1;
+ ret = qemudDomainAttachDiskDevice(dom, dev);
+ }
+ break;
+ }
} else if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV &&
dev->data.hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
dev->data.hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB) {
+ supported = 1;
ret = qemudDomainAttachHostDevice(dom, dev);
- } else {
+ }
+
+ if (!supported) {
qemudReportError(dom->conn, dom, NULL, VIR_ERR_NO_SUPPORT,
"%s", _("this device type cannot be attached"));
ret = -1;
--
1.6.0.2
--
Libvir-list mailing list
Libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list