mir/lxc
2
0
Fork 0
mirror of git://github.com/lxc/lxc synced 2025-08-29 17:49:50 +00:00
Code Issues Releases Wiki Activity

fix build with --enable-tests

Browse Source 
Signed-off-by: Dwight Engen <dwight.engen@oracle.com>
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
This commit is contained in:
Dwight Engen 2013-05-21 13:30:09 -04:00 committed by Serge Hallyn
parent fa9ac567a7
commit 481624b37b
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/lxc/lxccontainer.h
View File

@ -103,6 +103,7 @@ struct lxc_container {
* then the original backing store's size will be used if possible. Note this * 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 * only applies to the rootfs. For any other filesystems, the original size
* will be duplicated. * will be duplicated.
* @hookargs: additional arguments to pass to the clone hook script
*/ */
struct lxc_container *(*clone)(struct lxc_container *c, const char *newname, struct lxc_container *(*clone)(struct lxc_container *c, const char *newname,
const char *lxcpath, int flags, const char *bdevtype, const char *lxcpath, int flags, const char *bdevtype,

3
src/tests/cgpath.c
View File

@ -27,6 +27,7 @@
#include <errno.h> #include <errno.h>
#include "../lxc/cgroup.h" #include "../lxc/cgroup.h"
#include "../lxc/lxc.h" #include "../lxc/lxc.h"
#include "../lxc/commands.h"
#define MYNAME "lxctest1" #define MYNAME "lxctest1"
#define MYNAME2 "lxctest2" #define MYNAME2 "lxctest2"
@ -39,6 +40,7 @@ int main()
{ {
struct lxc_container *c = NULL, *c2 = NULL; struct lxc_container *c = NULL, *c2 = NULL;
char *path; char *path;
char *dirpath = NULL;
int len; int len;
int ret, retv = -1; int ret, retv = -1;
@ -136,7 +138,6 @@ int main()
goto out; goto out;
} }
const char *dirpath;
dirpath = lxc_cmd_get_cgroup_path(NULL, c2->name, c2->config_path); dirpath = lxc_cmd_get_cgroup_path(NULL, c2->name, c2->config_path);
if (!dirpath) { if (!dirpath) {
TSTERR("getting second container's cgpath"); TSTERR("getting second container's cgpath");

10
src/tests/clonetest.c
View File

@ -64,7 +64,7 @@ int main(int argc, char *argv[])
goto out; 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) { if (!c2) {
fprintf(stderr, "%d: %s clone returned NULL\n", __LINE__, MYNAME2); fprintf(stderr, "%d: %s clone returned NULL\n", __LINE__, MYNAME2);
goto out; goto out;
@ -118,7 +118,7 @@ int main(int argc, char *argv[])
goto out; 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"); fprintf(stderr, "lvm clone failed\n");
goto out; goto out;
} }
@ -134,7 +134,7 @@ int main(int argc, char *argv[])
c2 = NULL; 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"); fprintf(stderr, "lvm clone failed\n");
goto out; goto out;
} }
@ -148,13 +148,13 @@ int main(int argc, char *argv[])
} }
// Now create an overlayfs clone of a dir-backed container // 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"); fprintf(stderr, "overlayfs clone of dir failed\n");
goto out; goto out;
} }
// Now create an overlayfs clone of the overlayfs clone // 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"); fprintf(stderr, "overlayfs clone of overlayfs failed\n");
goto out; goto out;
} }