From d7d3a0aed168be92652b6ef2fb69fe9da4eefd95 Mon Sep 17 00:00:00 2001
From: "Andrea C. Granata" <andrea.granata@zephirworks.com>
Date: Sun, 4 May 2014 19:38:33 +0200
Subject: [PATCH] Allow passing of bdevspecs to Container#create

---
 ext/lxc/lxc.c | 68 +++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 61 insertions(+), 7 deletions(-)

diff --git a/ext/lxc/lxc.c b/ext/lxc/lxc.c
index b3ad0fc..679eb41 100644
--- a/ext/lxc/lxc.c
+++ b/ext/lxc/lxc.c
@@ -51,6 +51,20 @@ struct container_data {
     struct lxc_container *container;
 };
 
+struct bdev_specs {
+    char *fstype;
+    uint64_t fssize;  // fs size in bytes
+    struct {
+        char *zfsroot;
+    } zfs;
+    struct {
+        char *vg;
+        char *lv;
+        char *thinpool; // lvm thin pool to use, if any
+    } lvm;
+    char *dir;
+};
+
 static char **
 ruby_to_c_string_array(VALUE rb_arr)
 {
@@ -1010,6 +1024,7 @@ struct container_create_without_gvl_args {
     struct container_data *data;
     char *template;
     char *bdevtype;
+    struct bdev_specs *bdevspecs;
     int flags;
     char **args;
 };
@@ -1021,14 +1036,14 @@ container_create_without_gvl(void *args_void)
         (struct container_create_without_gvl_args *)args_void;
     RETURN_WITHOUT_GVL(
         args->data->container->create(args->data->container, args->template,
-                                      args->bdevtype, NULL, args->flags,
+                                      args->bdevtype, args->bdevspecs, args->flags,
                                       args->args)
     );
 }
 
 /*
  * call-seq:
- *   container.create(template, bdevtype = nil, flags = 0, args = [])
+ *   container.create(template, bdevtype = nil, bdevspecs = {}, flags = 0, args = [])
  *
  * Creates a structure for the container according to the given template.
  * This usually consists of downloading and installing a Linux distribution
@@ -1040,17 +1055,57 @@ static VALUE
 container_create(int argc, VALUE *argv, VALUE self)
 {
     int ret;
-    VALUE rb_template, rb_bdevtype, rb_flags, rb_args;
+    struct bdev_specs spec;
     struct container_create_without_gvl_args args;
     char **default_args = { NULL };
+    VALUE rb_template, rb_bdevtype, rb_bdevspecs, rb_flags, rb_args;
+    VALUE fstype, fssize, zfsroot, lvname, vgname, thinpool, dir;
 
     args.args = default_args;
-    rb_scan_args(argc, argv, "13",
-                 &rb_template, &rb_bdevtype, &rb_flags, &rb_args);
+    rb_scan_args(argc, argv, "14",
+                 &rb_template, &rb_bdevtype, &rb_bdevspecs, &rb_flags,
+                 &rb_args);
+
+    if (!NIL_P(rb_bdevspecs)) {
+        memset(&spec, 0, sizeof(spec));
+
+        fstype = rb_hash_aref(rb_bdevspecs, SYMBOL("fstype"));
+        if (!NIL_P(fstype))
+            spec.fstype = StringValuePtr(fstype);
+
+        fssize = rb_hash_aref(rb_bdevspecs, SYMBOL("fssize"));
+        if (!NIL_P(fssize))
+            spec.fssize = NUM2ULONG(fssize);
+
+        zfsroot = rb_hash_aref(rb_bdevspecs, SYMBOL("zfsroot"));
+        if (!NIL_P(zfsroot))
+            spec.zfs.zfsroot = StringValuePtr(zfsroot);
+
+        lvname = rb_hash_aref(rb_bdevspecs, SYMBOL("lvname"));
+        if (!NIL_P(lvname))
+            spec.lvm.lv = StringValuePtr(lvname);
+
+        vgname = rb_hash_aref(rb_bdevspecs, SYMBOL("vgname"));
+        if (!NIL_P(vgname))
+            spec.lvm.vg = StringValuePtr(vgname);
+
+        thinpool = rb_hash_aref(rb_bdevspecs, SYMBOL("thinpool"));
+        if (!NIL_P(thinpool))
+            spec.lvm.thinpool = StringValuePtr(thinpool);
+
+        dir = rb_hash_aref(rb_bdevspecs, SYMBOL("dir"));
+        if (!NIL_P(dir))
+            spec.dir = StringValuePtr(dir);
+
+        args.bdevspecs = &spec;
+
+    } else {
+        args.bdevspecs = NULL;
+    }
 
     args.template = StringValuePtr(rb_template);
     args.bdevtype = NIL_P(rb_bdevtype) ? NULL : StringValuePtr(rb_bdevtype);
-    args.flags = NIL_P(rb_flags) ? 0 : NUM2INT(rb_flags);
+    args.flags    = NIL_P(rb_flags) ? 0 : NUM2INT(rb_flags);
     if (!NIL_P(rb_args))
         args.args = ruby_to_c_string_array(rb_args);
 
@@ -1067,7 +1122,6 @@ container_create(int argc, VALUE *argv, VALUE self)
     return self;
 }
 
-
 static RETURN_WITHOUT_GVL_TYPE
 destroy_without_gvl(void *data_void)
 {