From: Daniel P. Berrange <berrange@redhat.com>
Date: Tue, 9 Jul 2013 13:23:06 +0000 (+0100)
Subject: LXC: Set default driver for image backed filesystems
X-Git-Tag: v1.1.1-rc1~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3aac4e5632aafdde34a286f47e1e0fd250ab283a;p=thirdparty%2Flibvirt.git

LXC: Set default driver for image backed filesystems

If no explicit driver is set for an image backed filesystem,
set it to use the loop driver (if raw) or nbd driver (if
non-raw)

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

diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index 1d91422ce4..41d69b321f 100644
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -462,6 +462,14 @@ static int virLXCControllerSetupLoopDevices(virLXCControllerPtr ctrl)
         if (fs->type != VIR_DOMAIN_FS_TYPE_FILE)
             continue;
 
+        if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_DEFAULT) {
+            if (fs->format == VIR_STORAGE_FILE_RAW ||
+                fs->format == VIR_STORAGE_FILE_NONE)
+                fs->fsdriver = VIR_DOMAIN_FS_DRIVER_TYPE_LOOP;
+            else
+                fs->fsdriver = VIR_DOMAIN_FS_DRIVER_TYPE_NBD;
+        }
+
         if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_LOOP) {
             if (fs->format != VIR_STORAGE_FILE_RAW &&
                 fs->format != VIR_STORAGE_FILE_NONE) {