From: Daniel P. Berrange <berrange@redhat.com>
Date: Tue, 8 Oct 2013 15:36:49 +0000 (+0100)
Subject: Fix typo breaking cgroups for NBD backed filesystems
X-Git-Tag: CVE-2013-4401~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0894ce863f7c9fb0c3cd3bb9dfb56cfaa03f1756;p=thirdparty%2Flibvirt.git

Fix typo breaking cgroups for NBD backed filesystems

A typo in the setup of NBD backed filesystems meant the
/dev/nbdN device would not be added to the cgroups device
ACL.

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

diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index 5067bf1b27..aa30d8e375 100644
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -424,7 +424,7 @@ static int virLXCControllerSetupNBDDeviceFS(virDomainFSDefPtr fs)
      * We now change it into a block device type, so that
      * the rest of container setup 'just works'
      */
-    fs->type = VIR_DOMAIN_DISK_TYPE_BLOCK;
+    fs->type = VIR_DOMAIN_FS_TYPE_BLOCK;
     VIR_FREE(fs->src);
     fs->src = dev;