From: Dwight Engen <dwight.engen@oracle.com>
Date: Tue, 21 May 2013 17:30:09 +0000 (-0400)
Subject: fix build with --enable-tests
X-Git-Tag: lxc-1.0.0.alpha1~1^2~192
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=481624b37b37ffa98b735cf3f94e35d1fbd729e0;p=thirdparty%2Flxc.git

fix build with --enable-tests

Signed-off-by: Dwight Engen <dwight.engen@oracle.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/lxccontainer.h b/src/lxc/lxccontainer.h
index bf3168cb9..22ccb0b72 100644
--- a/src/lxc/lxccontainer.h
+++ b/src/lxc/lxccontainer.h
@@ -103,6 +103,7 @@ struct lxc_container {
 	 *  then the original backing store's size will be used if possible.  Note this
 	 *  only applies to the rootfs.  For any other filesystems, the original size
 	 *  will be duplicated.
+	 * @hookargs: additional arguments to pass to the clone hook script
 	 */
 	struct lxc_container *(*clone)(struct lxc_container *c, const char *newname,
 		const char *lxcpath, int flags, const char *bdevtype,
diff --git a/src/tests/cgpath.c b/src/tests/cgpath.c
index b7f088563..2497e9ee2 100644
--- a/src/tests/cgpath.c
+++ b/src/tests/cgpath.c
@@ -27,6 +27,7 @@
 #include <errno.h>
 #include "../lxc/cgroup.h"
 #include "../lxc/lxc.h"
+#include "../lxc/commands.h"
 
 #define MYNAME "lxctest1"
 #define MYNAME2 "lxctest2"
@@ -39,6 +40,7 @@ int main()
 {
 	struct lxc_container *c = NULL, *c2 = NULL;
 	char *path;
+	char *dirpath = NULL;
 	int len;
 	int ret, retv = -1;
 
@@ -136,7 +138,6 @@ int main()
 		goto out;
 	}
 
-	const char *dirpath;
 	dirpath = lxc_cmd_get_cgroup_path(NULL, c2->name, c2->config_path);
 	if (!dirpath) {
 		TSTERR("getting second container's cgpath");
diff --git a/src/tests/clonetest.c b/src/tests/clonetest.c
index 5644405e9..fbeacdf71 100644
--- a/src/tests/clonetest.c
+++ b/src/tests/clonetest.c
@@ -64,7 +64,7 @@ int main(int argc, char *argv[])
 		goto out;
 	}
 
-	c2 = c->clone(c, MYNAME2, NULL, 0, NULL, NULL, 0);
+	c2 = c->clone(c, MYNAME2, NULL, 0, NULL, NULL, 0, NULL);
 	if (!c2) {
 		fprintf(stderr, "%d: %s clone returned NULL\n", __LINE__, MYNAME2);
 		goto out;
@@ -118,7 +118,7 @@ int main(int argc, char *argv[])
 		goto out;
 	}
 
-	if ((c2 = c->clone(c, "clonetestlvm2", NULL, 0, NULL, NULL, 0)) == NULL) {
+	if ((c2 = c->clone(c, "clonetestlvm2", NULL, 0, NULL, NULL, 0, NULL)) == NULL) {
 		fprintf(stderr, "lvm clone failed\n");
 		goto out;
 	}
@@ -134,7 +134,7 @@ int main(int argc, char *argv[])
 		c2 = NULL;
 	}
 
-	if ((c2 = c->clone(c, "clonetestlvm3", NULL, LXC_CLONE_SNAPSHOT, NULL, NULL, 0)) == NULL) {
+	if ((c2 = c->clone(c, "clonetestlvm3", NULL, LXC_CLONE_SNAPSHOT, NULL, NULL, 0, NULL)) == NULL) {
 		fprintf(stderr, "lvm clone failed\n");
 		goto out;
 	}
@@ -148,13 +148,13 @@ int main(int argc, char *argv[])
 	}
 
 	// Now create an overlayfs clone of a dir-backed container
-	if ((c2 = c->clone(c, "clonetest-o1", NULL, LXC_CLONE_SNAPSHOT, "overlayfs", NULL, 0)) == NULL) {
+	if ((c2 = c->clone(c, "clonetest-o1", NULL, LXC_CLONE_SNAPSHOT, "overlayfs", NULL, 0, NULL)) == NULL) {
 		fprintf(stderr, "overlayfs clone of dir failed\n");
 		goto out;
 	}
 
 	// Now create an overlayfs clone of the overlayfs clone
-	if ((c3 = c2->clone(c2, "clonetest-o2", NULL, LXC_CLONE_SNAPSHOT, "overlayfs", NULL, 0)) == NULL) {
+	if ((c3 = c2->clone(c2, "clonetest-o2", NULL, LXC_CLONE_SNAPSHOT, "overlayfs", NULL, 0, NULL)) == NULL) {
 		fprintf(stderr, "overlayfs clone of overlayfs failed\n");
 		goto out;
 	}