add ploop fs driver type

Ploop is a pseudo device which makeit possible to access
to an image in a file as a block device. Like loop devices,
but with additional features, like snapshots, write tracker
and without double-caching.

It used in PCS for containers and in OpenVZ. You can manage
ploop devices and images with ploop utility
(http://git.openvz.org/?p=ploop).

Signed-off-by: Dmitry Guryanov <dguryanov@parallels.com>

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index dca09b6a9922383a91d816f05075f08846d08ada..f8d5f8921d0b556ef56beddaf58e30cd237373d0 100644 (file)
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -2626,7 +2626,8 @@
             attribute provides the format type. For example, LXC
             supports a type of "loop", with a format of "raw" or
             "nbd" with any format. QEMU supports a type of "path"
-            or "handle", but no formats.
+            or "handle", but no formats. Parallels driver supports
+            a type of "ploop" with a format of "ploop".
           </li>
         </ul>
       </dd>

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 7fe1387972b5beaa2ddbec1bddbf15da6a2fd33d..c428ddf4f9cf7c2bf666ac9b28c992e09f5def32 100644 (file)
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -2003,6 +2003,7 @@
             <value>handle</value>
             <value>loop</value>
             <value>nbd</value>
+            <value>ploop</value>
           </choice>
         </attribute>
       </optional>

diff --git a/docs/schemas/storagecommon.rng b/docs/schemas/storagecommon.rng
index 629505f14726c97b516d32d66847b11d1b9ce676..5f71b10b305d675c928cb48747edcb8ac7037bfe 100644 (file)
--- a/docs/schemas/storagecommon.rng
+++ b/docs/schemas/storagecommon.rng
@@ -75,6 +75,7 @@
       <value>vdi</value>
       <value>fat</value>
       <value>vhd</value>
+      <value>ploop</value>
       <ref name='storageFormatBacking'/>
     </choice>
   </define>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index cdd64b1cdb78363f9631a5cac9bdef5eecd8dc6b..8792f5ee7098c2bedc0c4280aeb11a38ccda35a8 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -351,7 +351,8 @@ VIR_ENUM_IMPL(virDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST,
               "path",
               "handle",
               "loop",
-              "nbd")
+              "nbd",
+              "ploop")
 
 VIR_ENUM_IMPL(virDomainFSAccessMode, VIR_DOMAIN_FS_ACCESSMODE_LAST,
               "passthrough",

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 1f77720a91607fefc19e41d9c51cb739db9ef9c3..09ab194461f68c26f628f135efaa07bbcc651c32 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -804,6 +804,7 @@ typedef enum {
     VIR_DOMAIN_FS_DRIVER_TYPE_HANDLE,
     VIR_DOMAIN_FS_DRIVER_TYPE_LOOP,
     VIR_DOMAIN_FS_DRIVER_TYPE_NBD,
+    VIR_DOMAIN_FS_DRIVER_TYPE_PLOOP,
 
     VIR_DOMAIN_FS_DRIVER_TYPE_LAST
 } virDomainFSDriverType;

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 2d634a3a839c80b4087348ac97f0db78b476a0ae..c041ee77bdd0656d0ff68c7e19a608ddae15c4c7 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -151,6 +151,7 @@ VIR_ENUM_IMPL(qemuDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST,
               "local",
               "handle",
               NULL,
+              NULL,
               NULL);
 
 VIR_ENUM_DECL(qemuNumaPolicy)

diff --git a/tests/domainschemadata/domain-parallels-ct-simple.xml b/tests/domainschemadata/domain-parallels-ct-simple.xml
index a2b87ce8516c886fba74f4dd8a1be67230259e48..b79e963a381aa3e90e9b24e5b61e3145c3e7df04 100644 (file)
--- a/tests/domainschemadata/domain-parallels-ct-simple.xml
+++ b/tests/domainschemadata/domain-parallels-ct-simple.xml
@@ -18,6 +18,11 @@
         <source name='centos-6-x86_64'/>
         <target dir='/'/>
     </filesystem>
+    <filesystem type='file' accessmode='passthrough'>
+      <driver type='ploop' format='ploop'/>
+      <source file='/path/to/ploop/dir'/>
+      <target dir='/mnt'/>
+    </filesystem>
     <video>
       <model type='vga' vram='16777216' heads='1'>
         <acceleration accel3d='no' accel2d='no'/>