[libvirt] [PATCH 03/15] qemu: Add/remove the shared disk entry during domain's lifecyle

Osier Yang jyang at redhat.com
Wed Dec 5 08:20:37 UTC 2012


Lifecyle here only means starting and shutdown.
---
 src/qemu/qemu_process.c |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index ab04599..a44cca1 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3708,6 +3708,13 @@ int qemuProcessStart(virConnectPtr conn,
     for (i = 0; i < vm->def->ndisks; i++) {
         if (vm->def->disks[i]->rawio == 1)
             virCommandAllowCap(cmd, CAP_SYS_RAWIO);
+
+        if (vm->def->disks[i]->shared &&
+            (qemuSharedDiskListAdd(driver->sharedDisks,
+                                   vm->def->disks[i]->src,
+                                   vm->def->name) < 0)) {
+            goto cleanup;
+        }
     }
 
     virCommandSetPreExecHook(cmd, qemuProcessHook, &hookData);
@@ -4104,6 +4111,19 @@ void qemuProcessStop(virQEMUDriverPtr driver,
                                           flags & VIR_QEMU_PROCESS_STOP_MIGRATED);
     virSecurityManagerReleaseLabel(driver->securityManager, vm->def);
 
+    /* Remove the shared disk entry from qemud_driver->sharedDisks */
+    for (i = 0; i < vm->def->ndisks; i++) {
+        if (vm->def->disks[i]->shared &&
+            (qemuSharedDiskListDel(driver->sharedDisks,
+                                   vm->def->disks[i]->src,
+                                   vm->def->name) < 0)) {
+            VIR_WARN("Unable to remove shared disk entry for "
+                     "disk = '%s', domain = '%s'",
+                     vm->def->disks[i]->src,
+                     vm->def->name);
+        }
+    }
+
     /* Clear out dynamically assigned labels */
     for (i = 0; i < vm->def->nseclabels; i++) {
         if (vm->def->seclabels[i]->type == VIR_DOMAIN_SECLABEL_DYNAMIC) {
-- 
1.7.7.6




More information about the libvir-list mailing list