From: Daniel P. Berrange <berrange@redhat.com>
Date: Thu, 22 Nov 2012 15:41:41 +0000 (+0000)
Subject: Add support for attach/detach/update disk devices in config for LXC
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=8cacd8b4ea35eb2d69054ce33d40533eb3ccb6b1;p=libvirt.git

Add support for attach/detach/update disk devices in config for LXC

Wire up the attach/detach/update device APIs to support changing
of disks in the persistent config file

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index 19d897966d..017d987079 100644
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -2926,9 +2926,26 @@ lxcDomainAttachDeviceConfig(virDomainDefPtr vmdef,
                             virDomainDeviceDefPtr dev)
 {
     int ret = -1;
+    virDomainDiskDefPtr disk;
     virDomainNetDefPtr net;
 
     switch (dev->type) {
+    case VIR_DOMAIN_DEVICE_DISK:
+        disk = dev->data.disk;
+        if (virDomainDiskIndexByName(vmdef, disk->dst, true) >= 0) {
+            virReportError(VIR_ERR_INVALID_ARG,
+                           _("target %s already exists."), disk->dst);
+            return -1;
+        }
+        if (virDomainDiskInsert(vmdef, disk)) {
+            virReportOOMError();
+            return -1;
+        }
+        /* vmdef has the pointer. Generic codes for vmdef will do all jobs */
+        dev->data.disk = NULL;
+        ret = 0;
+        break;
+
     case VIR_DOMAIN_DEVICE_NET:
         net = dev->data.net;
         if (virDomainNetInsert(vmdef, net) < 0) {
@@ -2998,11 +3015,23 @@ lxcDomainDetachDeviceConfig(virDomainDefPtr vmdef,
                             virDomainDeviceDefPtr dev)
 {
     int ret = -1;
+    virDomainDiskDefPtr disk, det_disk;
     virDomainNetDefPtr net;
     int idx;
     char mac[VIR_MAC_STRING_BUFLEN];
 
     switch (dev->type) {
+    case VIR_DOMAIN_DEVICE_DISK:
+        disk = dev->data.disk;
+        if (!(det_disk = virDomainDiskRemoveByName(vmdef, disk->dst))) {
+            virReportError(VIR_ERR_INVALID_ARG,
+                           _("no target device %s"), disk->dst);
+            return -1;
+        }
+        virDomainDiskDefFree(det_disk);
+        ret = 0;
+        break;
+
     case VIR_DOMAIN_DEVICE_NET:
         net = dev->data.net;
         idx = virDomainNetFindIdx(vmdef, net);