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

lxccontainer: properly wrap lxcapi_create()

Browse Source 
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner 2022-01-20 10:14:13 +01:00
parent bceb81cd26
commit ad8a3bd68a
No known key found for this signature in database
GPG Key ID: 91C61BC06578DCA2
1 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/lxc/lxccontainer.c
View File

@ -443,7 +443,26 @@ static rettype fnname(struct lxc_container *c, t1 a1, t2 a2, t3 a3) \
return ret; \ return ret; \
} }
#define WRAP_API_6(rettype, fnname, t1, t2, t3, t4, t5, t6) \ #define WRAP_API_5(rettype, fnname, t1, t2, t3, t4, t5) \
static rettype fnname(struct lxc_container *c, t1 a1, t2 a2, t3 a3, \
t4 a4, t5 a5) \
{ \
rettype ret; \
bool reset_config = false; \
\
if (!current_config && c && c->lxc_conf) { \
current_config = c->lxc_conf; \
reset_config = true; \
} \
\
ret = do_##fnname(c, a1, a2, a3, a4, a5); \
if (reset_config) \
current_config = NULL; \
\
return ret; \
}
#define WRAP_API_6(rettype, fnname, t1, t2, t3, t4, t5, t6) \
static rettype fnname(struct lxc_container *c, t1 a1, t2 a2, t3 a3, \ static rettype fnname(struct lxc_container *c, t1 a1, t2 a2, t3 a3, \
t4 a4, t5 a5, t6 a6) \ t4 a4, t5 a5, t6 a6) \
{ \ { \
@ -1759,9 +1778,9 @@ static void lxcapi_clear_config(struct lxc_container *c)
* @argv: the arguments to pass to the template, terminated by NULL. If no * @argv: the arguments to pass to the template, terminated by NULL. If no
* arguments, you can just pass NULL. * arguments, you can just pass NULL.
*/ */
static bool do_lxcapi_create(struct lxc_container *c, const char *t, static bool __lxcapi_create(struct lxc_container *c, const char *t,
const char *bdevtype, struct bdev_specs *specs, const char *bdevtype, struct bdev_specs *specs,
int flags, char *const argv[]) int flags, char *const argv[])
{ {
__do_close int fd_rootfs = -EBADF; __do_close int fd_rootfs = -EBADF;
__do_free char *path_template = NULL; __do_free char *path_template = NULL;
@ -1927,19 +1946,16 @@ out:
return bret; return bret;
} }
static bool lxcapi_create(struct lxc_container *c, const char *t, static bool do_lxcapi_create(struct lxc_container *c, const char *t,
const char *bdevtype, struct bdev_specs *specs, const char *bdevtype, struct bdev_specs *specs,
int flags, char *const argv[]) int flags, char *const argv[])
{ {
bool ret; return __lxcapi_create(c, t, bdevtype, specs, flags, argv);
current_config = c ? c->lxc_conf : NULL;
ret = do_lxcapi_create(c, t, bdevtype, specs, flags, argv);
current_config = NULL;
return ret;
} }
WRAP_API_5(bool, lxcapi_create, const char *, const char *,
struct bdev_specs *, int, char *const *)
static bool do_lxcapi_reboot(struct lxc_container *c) static bool do_lxcapi_reboot(struct lxc_container *c)
{ {
__do_close int pidfd = -EBADF; __do_close int pidfd = -EBADF;
@ -2167,7 +2183,7 @@ static bool lxcapi_createl(struct lxc_container *c, const char *t,
goto out; goto out;
} }
bret = do_lxcapi_create(c, t, bdevtype, specs, flags, args); bret = __lxcapi_create(c, t, bdevtype, specs, flags, args);
out: out:
free(args); free(args);