[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH v3 2/3] libvirt/qemu - support updating inactive domains.



>From fff185c7ae8892cb4d39f7adb90fe9e13cef5638 Mon Sep 17 00:00:00 2001
From: KAMEZAWA Hiroyuki <kamezawa bluextal (none)>
Date: Thu, 24 Feb 2011 19:02:42 +0900
Subject: [PATCH 2/3] libvirt/qemu - support updating inactive domains.

Now, virsh attach-disk/detach-disk has --persistent option and
it can update XML definition of inactive domains. But, it's only
supported in Xen.

This patch adds support for attach-disk/detach-disk for qemu.

Note: This patch just allows to modify XML definition of 'inactive'
domain. More patches will be required for modify 'active' domain
in persistent mode. (modify XML + do hotplug)

Signed-off-by: KAMEZAWA Hiroyuki <kamezawa hiroyu jp fujitsu com>

Changelog v2->v3:
  - clean ups.
  - handle all VIR_DOMAIN_DEVICE_MODIFY_XXX flags.
---
 src/qemu/qemu_driver.c |  185 ++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 173 insertions(+), 12 deletions(-)

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 1a7bec9..a2987c4 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -4097,16 +4097,173 @@ cleanup:
     return ret;
 }
 
-static int qemudDomainAttachDeviceFlags(virDomainPtr dom,
+static int qemuDomainFindDiskByName(virDomainDefPtr vmdef, const char *name)
+{
+    virDomainDiskDefPtr vdisk;
+    int i;
+
+    for (i = 0; i < vmdef->ndisks; i++) {
+        vdisk = vmdef->disks[i];
+        if (STREQ(vdisk->dst, name))
+            return i;
+    }
+    return -1;
+}
+/*
+ * Attach a device given by XML, the change will be persistent
+ * and domain XML definition file is updated.
+ */
+static int qemuDomainAttachDevicePersistent(virDomainDefPtr vmdef,
+                                            virDomainDeviceDefPtr newdev)
+{
+    virDomainDiskDefPtr disk;
+
+    /* At first, check device confliction */
+    switch(newdev->type) {
+    case VIR_DOMAIN_DEVICE_DISK:
+        disk = newdev->data.disk;
+        if (qemuDomainFindDiskByName(vmdef, disk->dst) >= 0) {
+            qemuReportError(VIR_ERR_INVALID_ARG,
+                 _("target %s already exists."), disk->dst);
+            return -1;
+        }
+
+        if (virDomainDiskInsert(vmdef, disk)) /* only failed with OOM */
+            return -1;
+
+        if (disk->bus == VIR_DOMAIN_DISK_BUS_VIRTIO &&
+            qemuDomainAssignPCIAddresses(vmdef) < 0)
+                return -1;
+        newdev->data.disk = NULL;
+        break;
+    default:
+        qemuReportError(VIR_ERR_INVALID_ARG, "%s",
+                        _("Sorry, the device is not suppored for now"));
+        return -1;
+    }
+    
+    return 0;
+}
+
+static int qemuDomainDetachDevicePersistent(virDomainDefPtr vmdef,
+                                       virDomainDeviceDefPtr device)
+{
+    int x;
+    virDomainDiskDefPtr disk;
+
+    switch(device->type) {
+    case VIR_DOMAIN_DEVICE_DISK:
+        disk = device->data.disk;
+        x = qemuDomainFindDiskByName(vmdef, disk->dst);
+        if (x < 0) {
+            qemuReportError(VIR_ERR_INVALID_ARG,
+                 _("target %s doesn't exist."), disk->dst);
+            return -1;
+        }
+        virDomainDiskRemove(vmdef, x);
+        break;
+    default:
+        qemuReportError(VIR_ERR_INVALID_ARG, "%s",
+                        _("Sorry, the device is not suppored for now"));
+        return -1;
+    }
+    return 0;
+}
+
+static int qemuDomainModifyDevicePersistent(virDomainPtr dom,
                                         const char *xml,
-                                        unsigned int flags) {
-    if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) {
-        qemuReportError(VIR_ERR_OPERATION_INVALID,
-                        "%s", _("cannot modify the persistent configuration of a domain"));
+                                        unsigned int attach, int flags)
+{
+    struct qemud_driver *driver;
+    virDomainDeviceDefPtr device;
+    virDomainDefPtr vmdef;
+    virDomainObjPtr vm;
+    int ret = -1;
+
+    if (!dom || !dom->conn || !dom->name || !xml) {
+        qemuReportError(VIR_ERR_INTERNAL_ERROR,
+                        _("internal error : %s"),  __FUNCTION__);
+        return -1;
+    }
+    /*
+     * When both of MODIFY_CONFIG and MODIFY_LIVE is specified at the same time,
+     * return error for now. We should support this later.
+     */
+    if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE) {
+        qemuReportError(VIR_ERR_INVALID_ARG, "%s",
+                        _("Now, cannot modify alive domain and its definition "
+                          "at the same time."));
         return -1;
     }
 
-    return qemudDomainAttachDevice(dom, xml);
+    driver = dom->conn->privateData;
+    qemuDriverLock(driver);
+    vm = virDomainFindByUUID(&driver->domains, dom->uuid);
+    if (!vm) {
+        qemuReportError(VIR_ERR_NO_DOMAIN, _("cannot find domain '%s'"),
+                        dom->name);
+        goto unlock_out;
+    }
+
+    if (qemuDomainObjBeginJobWithDriver(driver, vm) < 0) 
+        goto unlock_out;
+
+    if (virDomainObjIsActive(vm)) {
+        /*
+         * For now, just allow updating inactive domains. Further development
+         * will allow updating both active domain and its config file at
+         * the same time.
+         */
+        qemuReportError(VIR_ERR_OPERATION_INVALID, "%s",
+              _("Now, it's unsupported to update active domain's definition."));
+        goto endjob;
+    }
+
+    vmdef = virDomainObjGetPersistentDef(driver->caps, vm);
+
+    if (!vmdef)
+        goto endjob;
+
+    device = virDomainDeviceDefParse(driver->caps,
+                 vmdef, xml, VIR_DOMAIN_XML_INACTIVE);
+    if (!device)
+        goto endjob;
+
+    if (attach)
+        ret = qemuDomainAttachDevicePersistent(vmdef, device);
+    else
+        ret = qemuDomainDetachDevicePersistent(vmdef, device);
+
+    if (!ret) /* save the result */
+        ret = virDomainSaveConfig(driver->configDir, vmdef);
+
+    virDomainDeviceDefFree(device);
+
+endjob:
+    if (qemuDomainObjEndJob(vm) == 0)
+        vm = NULL;
+    if (vm)
+        virDomainObjUnlock(vm);
+unlock_out:
+    qemuDriverUnlock(driver);
+    return ret;
+}
+
+static int qemudDomainAttachDeviceFlags(virDomainPtr dom,
+                                        const char *xml,
+                                        unsigned int flags)
+{
+    if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG)
+        return qemuDomainModifyDevicePersistent(dom, xml, 1, flags);
+
+    if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE)
+        return qemudDomainAttachDevice(dom, xml);
+
+    qemuReportError(VIR_ERR_INVALID_ARG, 
+        _("bad flag: %x only MODIFY_LIVE, MODIFY_CONFIG are supported now"),
+       flags);
+
+    return -1;
 }
 
 
@@ -4320,13 +4477,17 @@ cleanup:
 static int qemudDomainDetachDeviceFlags(virDomainPtr dom,
                                         const char *xml,
                                         unsigned int flags) {
-    if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG) {
-        qemuReportError(VIR_ERR_OPERATION_INVALID,
-                        "%s", _("cannot modify the persistent configuration of a domain"));
-        return -1;
-    }
 
-    return qemudDomainDetachDevice(dom, xml);
+    if (flags & VIR_DOMAIN_DEVICE_MODIFY_CONFIG)
+        return qemuDomainModifyDevicePersistent(dom, xml, 0, flags);
+
+    if (flags & VIR_DOMAIN_DEVICE_MODIFY_LIVE)
+        return qemudDomainDetachDevice(dom, xml);
+
+    qemuReportError(VIR_ERR_INVALID_ARG,
+        _("bad flag: %x only MODIFY_LIVE, MODIFY_CONFIG are supported now"),
+       flags);
+    return -1;
 }
 
 static int qemudDomainGetAutostart(virDomainPtr dom,
-- 
1.7.1



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]