From 2e17f1e8550a26e2274aace7adc314b842b2a8d4 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Tue, 21 Jul 2020 12:24:45 +0200 Subject: [PATCH] start: hide unnecessary symbols Signed-off-by: Christian Brauner --- src/lxc/Makefile.am | 202 +++++++++++++++++++++++++++++++++++++++++- src/lxc/start.h | 37 ++++---- src/tests/Makefile.am | 27 ++++++ 3 files changed, 244 insertions(+), 22 deletions(-) diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am index 1bfcfcabb7..5c99913a81 100644 --- a/src/lxc/Makefile.am +++ b/src/lxc/Makefile.am @@ -333,18 +333,26 @@ lxc_attach_SOURCES = tools/lxc_attach.c \ tools/arguments.c tools/arguments.h \ af_unix.c af_unix.h \ caps.c caps.h \ + commands.c commands.h \ + commands_utils.c commands_utils.h \ conf.c conf.h \ confile.c confile.h \ confile_utils.c confile_utils.h \ + error.c error.h \ file_utils.c file_utils.h \ initutils.c initutils.h \ log.c log.h \ + lxclock.c lxclock.h \ + mainloop.c mainloop.h \ + monitor.c monitor.h \ namespace.c namespace.h \ network.c network.h \ nl.c nl.h \ parse.c parse.h \ process_utils.c process_utils.h \ rexec.c rexec.h \ + ringbuf.c ringbuf.h \ + start.c start.h \ string_utils.c string_utils.h if ENABLE_SECCOMP lxc_attach_SOURCES += seccomp.c lxcseccomp.h @@ -354,17 +362,25 @@ lxc_autostart_SOURCES = tools/lxc_autostart.c \ tools/arguments.c tools/arguments.h \ af_unix.c af_unix.h \ caps.c caps.h \ + commands.c commands.h \ + commands_utils.c commands_utils.h \ conf.c conf.h \ confile.c confile.h \ confile_utils.c confile_utils.h \ + error.c error.h \ file_utils.c file_utils.h \ initutils.c initutils.h \ log.c log.h \ + lxclock.c lxclock.h \ + mainloop.c mainloop.h \ + monitor.c monitor.h \ namespace.c namespace.h \ network.c network.h \ nl.c nl.h \ parse.c parse.h \ process_utils.c process_utils.h \ + ringbuf.c ringbuf.h \ + start.c start.h \ string_utils.c string_utils.h if ENABLE_SECCOMP lxc_autostart_SOURCES += seccomp.c lxcseccomp.h @@ -374,17 +390,25 @@ lxc_cgroup_SOURCES = tools/lxc_cgroup.c \ tools/arguments.c tools/arguments.h \ af_unix.c af_unix.h \ caps.c caps.h \ + commands.c commands.h \ + commands_utils.c commands_utils.h \ conf.c conf.h \ confile.c confile.h \ confile_utils.c confile_utils.h \ + error.c error.h \ file_utils.c file_utils.h \ initutils.c initutils.h \ log.c log.h \ + lxclock.c lxclock.h \ + mainloop.c mainloop.h \ + monitor.c monitor.h \ namespace.c namespace.h \ network.c network.h \ nl.c nl.h \ parse.c parse.h \ process_utils.c process_utils.h \ + ringbuf.c ringbuf.h \ + start.c start.h \ string_utils.c string_utils.h if ENABLE_SECCOMP lxc_cgroup_SOURCES += seccomp.c lxcseccomp.h @@ -394,17 +418,25 @@ lxc_config_SOURCES = tools/lxc_config.c \ tools/arguments.c tools/arguments.h \ af_unix.c af_unix.h \ caps.c caps.h \ + commands.c commands.h \ + commands_utils.c commands_utils.h \ conf.c conf.h \ confile.c confile.h \ confile_utils.c confile_utils.h \ + error.c error.h \ file_utils.c file_utils.h \ initutils.c initutils.h \ log.c log.h \ + lxclock.c lxclock.h \ + mainloop.c mainloop.h \ + monitor.c monitor.h \ namespace.c namespace.h \ network.c network.h \ nl.c nl.h \ parse.c parse.h \ process_utils.c process_utils.h \ + ringbuf.c ringbuf.h \ + start.c start.h \ string_utils.c string_utils.h if ENABLE_SECCOMP lxc_config_SOURCES += seccomp.c lxcseccomp.h @@ -414,17 +446,25 @@ lxc_console_SOURCES = tools/lxc_console.c \ tools/arguments.c tools/arguments.h \ af_unix.c af_unix.h \ caps.c caps.h \ + commands.c commands.h \ + commands_utils.c commands_utils.h \ conf.c conf.h \ confile.c confile.h \ confile_utils.c confile_utils.h \ + error.c error.h \ file_utils.c file_utils.h \ initutils.c initutils.h \ log.c log.h \ + lxclock.c lxclock.h \ + mainloop.c mainloop.h \ + monitor.c monitor.h \ namespace.c namespace.h \ network.c network.h \ nl.c nl.h \ parse.c parse.h \ process_utils.c process_utils.h \ + ringbuf.c ringbuf.h \ + start.c start.h \ string_utils.c string_utils.h if ENABLE_SECCOMP lxc_console_SOURCES += seccomp.c lxcseccomp.h @@ -434,17 +474,25 @@ lxc_destroy_SOURCES = tools/lxc_destroy.c \ tools/arguments.c tools/arguments.h \ af_unix.c af_unix.h \ caps.c caps.h \ + commands.c commands.h \ + commands_utils.c commands_utils.h \ conf.c conf.h \ confile.c confile.h \ confile_utils.c confile_utils.h \ + error.c error.h \ file_utils.c file_utils.h \ initutils.c initutils.h \ log.c log.h \ + lxclock.c lxclock.h \ + mainloop.c mainloop.h \ + monitor.c monitor.h \ namespace.c namespace.h \ network.c network.h \ nl.c nl.h \ parse.c parse.h \ process_utils.c process_utils.h \ + ringbuf.c ringbuf.h \ + start.c start.h \ string_utils.c string_utils.h if ENABLE_SECCOMP lxc_destroy_SOURCES += seccomp.c lxcseccomp.h @@ -454,17 +502,25 @@ lxc_device_SOURCES = tools/lxc_device.c \ tools/arguments.c tools/arguments.h \ af_unix.c af_unix.h \ caps.c caps.h \ + commands.c commands.h \ + commands_utils.c commands_utils.h \ conf.c conf.h \ confile.c confile.h \ confile_utils.c confile_utils.h \ + error.c error.h \ file_utils.c file_utils.h \ initutils.c initutils.h \ log.c log.h \ + lxclock.c lxclock.h \ + mainloop.c mainloop.h \ + monitor.c monitor.h \ namespace.c namespace.h \ network.c network.h \ nl.c nl.h \ parse.c parse.h \ process_utils.c process_utils.h \ + ringbuf.c ringbuf.h \ + start.c start.h \ string_utils.c string_utils.h if ENABLE_SECCOMP lxc_device_SOURCES += seccomp.c lxcseccomp.h @@ -474,17 +530,25 @@ lxc_execute_SOURCES = tools/lxc_execute.c \ tools/arguments.c tools/arguments.h \ af_unix.c af_unix.h \ caps.c caps.h \ + commands.c commands.h \ + commands_utils.c commands_utils.h \ conf.c conf.h \ confile.c confile.h \ confile_utils.c confile_utils.h \ + error.c error.h \ file_utils.c file_utils.h \ initutils.c initutils.h \ log.c log.h \ + lxclock.c lxclock.h \ + mainloop.c mainloop.h \ + monitor.c monitor.h \ namespace.c namespace.h \ network.c network.h \ nl.c nl.h \ parse.c parse.h \ process_utils.c process_utils.h \ + ringbuf.c ringbuf.h \ + start.c start.h \ string_utils.c string_utils.h if ENABLE_SECCOMP lxc_execute_SOURCES += seccomp.c lxcseccomp.h @@ -494,17 +558,25 @@ lxc_freeze_SOURCES = tools/lxc_freeze.c \ tools/arguments.c tools/arguments.h \ af_unix.c af_unix.h \ caps.c caps.h \ + commands.c commands.h \ + commands_utils.c commands_utils.h \ conf.c conf.h \ confile.c confile.h \ confile_utils.c confile_utils.h \ + error.c error.h \ file_utils.c file_utils.h \ initutils.c initutils.h \ log.c log.h \ + lxclock.c lxclock.h \ + mainloop.c mainloop.h \ + monitor.c monitor.h \ namespace.c namespace.h \ network.c network.h \ nl.c nl.h \ parse.c parse.h \ process_utils.c process_utils.h \ + ringbuf.c ringbuf.h \ + start.c start.h \ string_utils.c string_utils.h if ENABLE_SECCOMP lxc_freeze_SOURCES += seccomp.c lxcseccomp.h @@ -514,17 +586,25 @@ lxc_info_SOURCES = tools/lxc_info.c \ tools/arguments.c tools/arguments.h \ af_unix.c af_unix.h \ caps.c caps.h \ + commands.c commands.h \ + commands_utils.c commands_utils.h \ conf.c conf.h \ confile.c confile.h \ confile_utils.c confile_utils.h \ + error.c error.h \ file_utils.c file_utils.h \ initutils.c initutils.h \ log.c log.h \ + lxclock.c lxclock.h \ + mainloop.c mainloop.h \ + monitor.c monitor.h \ namespace.c namespace.h \ network.c network.h \ nl.c nl.h \ parse.c parse.h \ process_utils.c process_utils.h \ + ringbuf.c ringbuf.h \ + start.c start.h \ string_utils.c string_utils.h if ENABLE_SECCOMP lxc_info_SOURCES += seccomp.c lxcseccomp.h @@ -534,19 +614,26 @@ lxc_monitor_SOURCES = tools/lxc_monitor.c \ tools/arguments.c tools/arguments.h \ af_unix.c af_unix.h \ caps.c caps.h \ + commands.c commands.h \ + commands_utils.c commands_utils.h \ conf.c conf.h \ confile.c confile.h \ confile_utils.c confile_utils.h \ + error.c error.h \ file_utils.c file_utils.h \ initutils.c initutils.h \ log.c log.h \ + lxclock.c lxclock.h \ macro.h \ + mainloop.c mainloop.h \ monitor.c monitor.h \ namespace.c namespace.h \ network.c network.h \ nl.c nl.h \ parse.c parse.h \ process_utils.c process_utils.h \ + ringbuf.c ringbuf.h \ + start.c start.h \ string_utils.c string_utils.h if ENABLE_SECCOMP lxc_monitor_SOURCES += seccomp.c lxcseccomp.h @@ -556,18 +643,26 @@ lxc_ls_SOURCES = tools/lxc_ls.c \ tools/arguments.c tools/arguments.h \ af_unix.c af_unix.h \ caps.c caps.h \ + commands.c commands.h \ + commands_utils.c commands_utils.h \ conf.c conf.h \ confile.c confile.h \ confile_utils.c confile_utils.h \ + error.c error.h \ file_utils.c file_utils.h \ initutils.c initutils.h \ log.c log.h \ + lxclock.c lxclock.h \ + mainloop.c mainloop.h \ memory_utils.h \ + monitor.c monitor.h \ namespace.c namespace.h \ network.c network.h \ nl.c nl.h \ parse.c parse.h \ process_utils.c process_utils.h \ + ringbuf.c ringbuf.h \ + start.c start.h \ string_utils.c string_utils.h if ENABLE_SECCOMP lxc_ls_SOURCES += seccomp.c lxcseccomp.h @@ -577,17 +672,25 @@ lxc_copy_SOURCES = tools/lxc_copy.c \ tools/arguments.c tools/arguments.h \ af_unix.c af_unix.h \ caps.c caps.h \ + commands.c commands.h \ + commands_utils.c commands_utils.h \ conf.c conf.h \ confile.c confile.h \ confile_utils.c confile_utils.h \ + error.c error.h \ file_utils.c file_utils.h \ initutils.c initutils.h \ log.c log.h \ + lxclock.c lxclock.h \ + mainloop.c mainloop.h \ + monitor.c monitor.h \ namespace.c namespace.h \ network.c network.h \ nl.c nl.h \ parse.c parse.h \ process_utils.c process_utils.h \ + ringbuf.c ringbuf.h \ + start.c start.h \ storage/storage_utils.c storage/storage_utils.h \ string_utils.c string_utils.h if ENABLE_SECCOMP @@ -598,17 +701,25 @@ lxc_start_SOURCES = tools/lxc_start.c \ tools/arguments.c tools/arguments.h \ af_unix.c af_unix.h \ caps.c caps.h \ + commands.c commands.h \ + commands_utils.c commands_utils.h \ conf.c conf.h \ confile.c confile.h \ confile_utils.c confile_utils.h \ + error.c error.h \ file_utils.c file_utils.h \ initutils.c initutils.h \ log.c log.h \ + lxclock.c lxclock.h \ + mainloop.c mainloop.h \ + monitor.c monitor.h \ namespace.c namespace.h \ network.c network.h \ nl.c nl.h \ parse.c parse.h \ process_utils.c process_utils.h \ + ringbuf.c ringbuf.h \ + start.c start.h \ string_utils.c string_utils.h if ENABLE_SECCOMP lxc_start_SOURCES += seccomp.c lxcseccomp.h @@ -618,18 +729,25 @@ lxc_stop_SOURCES = tools/lxc_stop.c \ tools/arguments.c tools/arguments.h \ af_unix.c af_unix.h \ caps.c caps.h \ + commands.c commands.h \ + commands_utils.c commands_utils.h \ conf.c conf.h \ confile.c confile.h \ confile_utils.c confile_utils.h \ + error.c error.h \ file_utils.c file_utils.h \ initutils.c initutils.h \ log.c log.h \ + lxclock.c lxclock.h \ mainloop.c mainloop.h \ + monitor.c monitor.h \ namespace.c namespace.h \ network.c network.h \ nl.c nl.h \ parse.c parse.h \ process_utils.c process_utils.h \ + ringbuf.c ringbuf.h \ + start.c start.h \ string_utils.c string_utils.h if ENABLE_SECCOMP lxc_stop_SOURCES += seccomp.c lxcseccomp.h @@ -639,18 +757,25 @@ lxc_top_SOURCES = tools/lxc_top.c \ tools/arguments.c tools/arguments.h \ af_unix.c af_unix.h \ caps.c caps.h \ + commands.c commands.h \ + commands_utils.c commands_utils.h \ conf.c conf.h \ confile.c confile.h \ confile_utils.c confile_utils.h \ + error.c error.h \ file_utils.c file_utils.h \ initutils.c initutils.h \ log.c log.h \ + lxclock.c lxclock.h \ mainloop.c mainloop.h \ + monitor.c monitor.h \ namespace.c namespace.h \ network.c network.h \ nl.c nl.h \ parse.c parse.h \ process_utils.c process_utils.h \ + ringbuf.c ringbuf.h \ + start.c start.h \ string_utils.c string_utils.h if ENABLE_SECCOMP lxc_top_SOURCES += seccomp.c lxcseccomp.h @@ -660,17 +785,25 @@ lxc_unfreeze_SOURCES = tools/lxc_unfreeze.c \ tools/arguments.c tools/arguments.h \ af_unix.c af_unix.h \ caps.c caps.h \ + commands.c commands.h \ + commands_utils.c commands_utils.h \ conf.c conf.h \ confile.c confile.h \ confile_utils.c confile_utils.h \ + error.c error.h \ file_utils.c file_utils.h \ initutils.c initutils.h \ log.c log.h \ + lxclock.c lxclock.h \ + mainloop.c mainloop.h \ + monitor.c monitor.h \ namespace.c namespace.h \ network.c network.h \ nl.c nl.h \ parse.c parse.h \ process_utils.c process_utils.h \ + ringbuf.c ringbuf.h \ + start.c start.h \ string_utils.c string_utils.h if ENABLE_SECCOMP lxc_unfreeze_SOURCES += seccomp.c lxcseccomp.h @@ -680,17 +813,25 @@ lxc_unshare_SOURCES = tools/lxc_unshare.c \ tools/arguments.c tools/arguments.h \ af_unix.c af_unix.h \ caps.c caps.h \ + commands.c commands.h \ + commands_utils.c commands_utils.h \ conf.c conf.h \ confile.c confile.h \ confile_utils.c confile_utils.h \ + error.c error.h \ file_utils.c file_utils.h \ initutils.c initutils.h \ log.c log.h \ + lxclock.c lxclock.h \ + mainloop.c mainloop.h \ + monitor.c monitor.h \ namespace.c namespace.h \ network.c network.h \ nl.c nl.h \ parse.c parse.h \ process_utils.c process_utils.h \ + ringbuf.c ringbuf.h \ + start.c start.h \ string_utils.c string_utils.h \ syscall_numbers.h \ syscall_wrappers.h @@ -702,17 +843,25 @@ lxc_wait_SOURCES = tools/lxc_wait.c \ tools/arguments.c tools/arguments.h \ af_unix.c af_unix.h \ caps.c caps.h \ + commands.c commands.h \ + commands_utils.c commands_utils.h \ conf.c conf.h \ confile.c confile.h \ confile_utils.c confile_utils.h \ + error.c error.h \ file_utils.c file_utils.h \ initutils.c initutils.h \ log.c log.h \ + lxclock.c lxclock.h \ + mainloop.c mainloop.h \ + monitor.c monitor.h \ namespace.c namespace.h \ network.c network.h \ nl.c nl.h \ parse.c parse.h \ process_utils.c process_utils.h \ + ringbuf.c ringbuf.h \ + start.c start.h \ string_utils.c string_utils.h if ENABLE_SECCOMP lxc_wait_SOURCES += seccomp.c lxcseccomp.h @@ -722,17 +871,25 @@ lxc_create_SOURCES = tools/lxc_create.c \ tools/arguments.c tools/arguments.h \ af_unix.c af_unix.h \ caps.c caps.h \ + commands.c commands.h \ + commands_utils.c commands_utils.h \ conf.c conf.h \ confile.c confile.h \ confile_utils.c confile_utils.h \ + error.c error.h \ file_utils.c file_utils.h \ initutils.c initutils.h \ log.c log.h \ + lxclock.c lxclock.h \ + mainloop.c mainloop.h \ + monitor.c monitor.h \ namespace.c namespace.h \ network.c network.h \ nl.c nl.h \ parse.c parse.h \ process_utils.c process_utils.h \ + ringbuf.c ringbuf.h \ + start.c start.h \ storage/storage_utils.c storage/storage_utils.h \ string_utils.c string_utils.h if ENABLE_SECCOMP @@ -743,17 +900,25 @@ lxc_snapshot_SOURCES = tools/lxc_snapshot.c \ tools/arguments.c tools/arguments.h \ af_unix.c af_unix.h \ caps.c caps.h \ + commands.c commands.h \ + commands_utils.c commands_utils.h \ conf.c conf.h \ confile.c confile.h \ confile_utils.c confile_utils.h \ + error.c error.h \ file_utils.c file_utils.h \ initutils.c initutils.h \ log.c log.h \ + lxclock.c lxclock.h \ + mainloop.c mainloop.h \ + monitor.c monitor.h \ namespace.c namespace.h \ network.c network.h \ nl.c nl.h \ parse.c parse.h \ process_utils.c process_utils.h \ + ringbuf.c ringbuf.h \ + start.c start.h \ string_utils.c string_utils.h if ENABLE_SECCOMP lxc_snapshot_SOURCES += seccomp.c lxcseccomp.h @@ -763,17 +928,25 @@ lxc_checkpoint_SOURCES = tools/lxc_checkpoint.c \ tools/arguments.c tools/arguments.h \ af_unix.c af_unix.h \ caps.c caps.h \ + commands.c commands.h \ + commands_utils.c commands_utils.h \ conf.c conf.h \ confile.c confile.h \ confile_utils.c confile_utils.h \ + error.c error.h \ file_utils.c file_utils.h \ initutils.c initutils.h \ log.c log.h \ + lxclock.c lxclock.h \ + mainloop.c mainloop.h \ + monitor.c monitor.h \ namespace.c namespace.h \ network.c network.h \ nl.c nl.h \ parse.c parse.h \ process_utils.c process_utils.h \ + ringbuf.c ringbuf.h \ + start.c start.h \ string_utils.c string_utils.h if ENABLE_SECCOMP lxc_checkpoint_SOURCES += seccomp.c lxcseccomp.h @@ -793,8 +966,9 @@ init_lxc_SOURCES = cmd/lxc_init.c \ memory_utils.h \ parse.c parse.h \ process_utils.c process_utils.h \ - syscall_numbers.h \ - string_utils.c string_utils.h + ringbuf.c ringbuf.h \ + string_utils.c string_utils.h \ + syscall_numbers.h if ENABLE_SECCOMP init_lxc_SOURCES += seccomp.c lxcseccomp.h endif @@ -804,12 +978,16 @@ init_lxc_LDFLAGS = -pthread lxc_monitord_SOURCES = cmd/lxc_monitord.c \ af_unix.c af_unix.h \ caps.c caps.h \ + commands.c commands.h \ + commands_utils.c commands_utils.h \ conf.c conf.h \ confile.c confile.h \ confile_utils.c confile_utils.h \ + error.c error.h \ file_utils.c file_utils.h \ initutils.c initutils.h \ log.c log.h \ + lxclock.c lxclock.h \ mainloop.c mainloop.h \ monitor.c monitor.h \ namespace.c namespace.h \ @@ -817,6 +995,8 @@ lxc_monitord_SOURCES = cmd/lxc_monitord.c \ nl.c nl.h \ parse.c parse.h \ process_utils.c process_utils.h \ + ringbuf.c ringbuf.h \ + start.c start.h \ string_utils.c string_utils.h \ syscall_numbers.h \ utils.c utils.h @@ -828,20 +1008,28 @@ lxc_user_nic_SOURCES = cmd/lxc_user_nic.c \ ../include/netns_ifaddrs.c ../include/netns_ifaddrs.h \ af_unix.c af_unix.h \ caps.c caps.h \ + commands.c commands.h \ + commands_utils.c commands_utils.h \ conf.c conf.h \ confile.c confile.h \ confile_utils.c confile_utils.h \ + error.c error.h \ file_utils.c file_utils.h \ initutils.c initutils.h \ log.c log.h \ + lxclock.c lxclock.h \ + mainloop.c mainloop.h \ memory_utils.h \ + monitor.c monitor.h \ namespace.c namespace.h \ network.c network.h \ nl.c nl.h \ parse.c parse.h \ process_utils.c process_utils.h \ - syscall_numbers.h \ + ringbuf.c ringbuf.h \ + start.c start.h \ string_utils.c string_utils.h \ + syscall_numbers.h \ syscall_wrappers.h if ENABLE_SECCOMP lxc_user_nic_SOURCES += seccomp.c lxcseccomp.h @@ -850,20 +1038,28 @@ endif lxc_usernsexec_SOURCES = cmd/lxc_usernsexec.c \ af_unix.c af_unix.h \ caps.c caps.h \ + commands.c commands.h \ + commands_utils.c commands_utils.h \ conf.c conf.h \ confile.c confile.h \ confile_utils.c confile_utils.h \ + error.c error.h \ file_utils.c file_utils.h \ initutils.c initutils.h \ list.h \ log.c log.h \ + lxclock.c lxclock.h \ macro.h \ + mainloop.c mainloop.h \ memory_utils.h \ + monitor.c monitor.h \ namespace.c namespace.h \ network.c network.h \ nl.c nl.h \ parse.c parse.h \ process_utils.c process_utils.h \ + ringbuf.c ringbuf.h \ + start.c start.h \ string_utils.c string_utils.h \ syscall_wrappers.h \ utils.c utils.h diff --git a/src/lxc/start.h b/src/lxc/start.h index ba66b05535..69b7362f3c 100644 --- a/src/lxc/start.h +++ b/src/lxc/start.h @@ -11,6 +11,7 @@ #include #include +#include "compiler.h" #include "conf.h" #include "macro.h" #include "namespace.h" @@ -140,20 +141,17 @@ struct lxc_operations { int (*post_start)(struct lxc_handler *, void *); }; -extern int lxc_poll(const char *name, struct lxc_handler *handler); -extern int lxc_set_state(const char *name, struct lxc_handler *handler, - lxc_state_t state); -extern int lxc_serve_state_clients(const char *name, - struct lxc_handler *handler, - lxc_state_t state); -extern void lxc_abort(struct lxc_handler *handler); -extern struct lxc_handler *lxc_init_handler(struct lxc_handler *old, - const char *name, - struct lxc_conf *conf, - const char *lxcpath, bool daemonize); -extern void lxc_put_handler(struct lxc_handler *handler); -extern int lxc_init(const char *name, struct lxc_handler *handler); -extern void lxc_end(struct lxc_handler *handler); +__hidden extern int lxc_poll(const char *name, struct lxc_handler *handler); +__hidden extern int lxc_set_state(const char *name, struct lxc_handler *handler, lxc_state_t state); +__hidden extern int lxc_serve_state_clients(const char *name, struct lxc_handler *handler, + lxc_state_t state); +__hidden extern void lxc_abort(struct lxc_handler *handler); +__hidden extern struct lxc_handler *lxc_init_handler(struct lxc_handler *old, const char *name, + struct lxc_conf *conf, const char *lxcpath, + bool daemonize); +__hidden extern void lxc_put_handler(struct lxc_handler *handler); +__hidden extern int lxc_init(const char *name, struct lxc_handler *handler); +__hidden extern void lxc_end(struct lxc_handler *handler); /* lxc_check_inherited: Check for any open file descriptors and close them if * requested. @@ -162,16 +160,17 @@ extern void lxc_end(struct lxc_handler *handler); * @param[in] fds_to_ignore Array of file descriptors to ignore. * @param[in] len_fds Length of fds_to_ignore array. */ -extern int lxc_check_inherited(struct lxc_conf *conf, bool closeall, - int *fds_to_ignore, size_t len_fds); +__hidden extern int lxc_check_inherited(struct lxc_conf *conf, bool closeall, int *fds_to_ignore, + size_t len_fds); static inline int inherit_fds(struct lxc_handler *handler, bool closeall) { return lxc_check_inherited(handler->conf, closeall, handler->keep_fds, ARRAY_SIZE(handler->keep_fds)); } -extern int __lxc_start(struct lxc_handler *, struct lxc_operations *, void *, - const char *, bool, int *); -extern int resolve_clone_flags(struct lxc_handler *handler); +__hidden extern int __lxc_start(struct lxc_handler *, struct lxc_operations *, void *, const char *, + bool, int *); + +__hidden extern int resolve_clone_flags(struct lxc_handler *handler); #endif diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index 6a6f5ff281..0b354437ef 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -15,16 +15,20 @@ lxc_test_api_reboot_SOURCES = api_reboot.c \ ../lxc/conf.c ../lxc/conf.h \ ../lxc/confile.c ../lxc/confile.h \ ../lxc/confile_utils.c ../lxc/confile_utils.h \ + ../lxc/error.c ../lxc/error.h \ ../lxc/file_utils.c ../lxc/file_utils.h \ ../lxc/initutils.c ../lxc/initutils.h \ ../lxc/log.c ../lxc/log.h \ + ../lxc/lxclock.c ../lxc/lxclock.h \ ../lxc/mainloop.c ../lxc/mainloop.h \ + ../lxc/monitor.c ../lxc/monitor.h \ ../lxc/namespace.c ../lxc/namespace.h \ ../lxc/network.c ../lxc/network.h \ ../lxc/nl.c ../lxc/nl.h \ ../lxc/parse.c ../lxc/parse.h \ ../lxc/process_utils.c ../lxc/process_utils.h \ ../lxc/ringbuf.c ../lxc/ringbuf.h \ + ../lxc/start.c ../lxc/start.h \ ../lxc/string_utils.c ../lxc/string_utils.h if ENABLE_SECCOMP lxc_test_api_reboot_SOURCES += ../lxc/seccomp.c ../lxc/lxcseccomp.h @@ -39,16 +43,20 @@ lxc_test_attach_SOURCES = attach.c \ ../lxc/conf.c ../lxc/conf.h \ ../lxc/confile.c ../lxc/confile.h \ ../lxc/confile_utils.c ../lxc/confile_utils.h \ + ../lxc/error.c ../lxc/error.h \ ../lxc/file_utils.c ../lxc/file_utils.h \ ../lxc/initutils.c ../lxc/initutils.h \ ../lxc/log.c ../lxc/log.h \ + ../lxc/lxclock.c ../lxc/lxclock.h \ ../lxc/mainloop.c ../lxc/mainloop.h \ + ../lxc/monitor.c ../lxc/monitor.h \ ../lxc/namespace.c ../lxc/namespace.h \ ../lxc/network.c ../lxc/network.h \ ../lxc/nl.c ../lxc/nl.h \ ../lxc/parse.c ../lxc/parse.h \ ../lxc/process_utils.c ../lxc/process_utils.h \ ../lxc/ringbuf.c ../lxc/ringbuf.h \ + ../lxc/start.c ../lxc/start.h \ ../lxc/string_utils.c ../lxc/string_utils.h if ENABLE_SECCOMP lxc_test_attach_SOURCES += ../lxc/seccomp.c ../lxc/lxcseccomp.h @@ -63,16 +71,20 @@ lxc_test_cgpath_SOURCES = cgpath.c \ ../lxc/conf.c ../lxc/conf.h \ ../lxc/confile.c ../lxc/confile.h \ ../lxc/confile_utils.c ../lxc/confile_utils.h \ + ../lxc/error.c ../lxc/error.h \ ../lxc/file_utils.c ../lxc/file_utils.h \ ../lxc/initutils.c ../lxc/initutils.h \ ../lxc/log.c ../lxc/log.h \ + ../lxc/lxclock.c ../lxc/lxclock.h \ ../lxc/mainloop.c ../lxc/mainloop.h \ + ../lxc/monitor.c ../lxc/monitor.h \ ../lxc/namespace.c ../lxc/namespace.h \ ../lxc/network.c ../lxc/network.h \ ../lxc/nl.c ../lxc/nl.h \ ../lxc/parse.c ../lxc/parse.h \ ../lxc/process_utils.c ../lxc/process_utils.h \ ../lxc/ringbuf.c ../lxc/ringbuf.h \ + ../lxc/start.c ../lxc/start.h \ ../lxc/string_utils.c ../lxc/string_utils.h if ENABLE_SECCOMP lxc_test_cgpath_SOURCES += ../lxc/seccomp.c ../lxc/lxcseccomp.h @@ -89,16 +101,20 @@ lxc_test_config_jump_table_SOURCES = config_jump_table.c \ ../lxc/conf.c ../lxc/conf.h \ ../lxc/confile.c ../lxc/confile.h \ ../lxc/confile_utils.c ../lxc/confile_utils.h \ + ../lxc/error.c ../lxc/error.h \ ../lxc/file_utils.c ../lxc/file_utils.h \ ../lxc/initutils.c ../lxc/initutils.h \ ../lxc/log.c ../lxc/log.h \ + ../lxc/lxclock.c ../lxc/lxclock.h \ ../lxc/mainloop.c ../lxc/mainloop.h \ + ../lxc/monitor.c ../lxc/monitor.h \ ../lxc/namespace.c ../lxc/namespace.h \ ../lxc/network.c ../lxc/network.h \ ../lxc/nl.c ../lxc/nl.h \ ../lxc/parse.c ../lxc/parse.h \ ../lxc/process_utils.c ../lxc/process_utils.h \ ../lxc/ringbuf.c ../lxc/ringbuf.h \ + ../lxc/start.c ../lxc/start.h \ ../lxc/string_utils.c ../lxc/string_utils.h if ENABLE_SECCOMP lxc_test_config_jump_table_SOURCES += ../lxc/seccomp.c ../lxc/lxcseccomp.h @@ -131,18 +147,25 @@ lxc_test_parse_config_file_SOURCES = parse_config_file.c \ lxctest.h \ ../lxc/af_unix.c ../lxc/af_unix.h \ ../lxc/caps.c ../lxc/caps.h \ + ../lxc/commands.c ../lxc/commands.h \ + ../lxc/commands_utils.c ../lxc/commands_utils.h \ ../lxc/conf.c ../lxc/conf.h \ ../lxc/confile.c ../lxc/confile.h \ ../lxc/confile_utils.c ../lxc/confile_utils.h \ + ../lxc/error.c ../lxc/error.h \ ../lxc/file_utils.c ../lxc/file_utils.h \ ../lxc/initutils.c ../lxc/initutils.h \ ../lxc/log.c ../lxc/log.h \ + ../lxc/lxclock.c ../lxc/lxclock.h \ + ../lxc/mainloop.c ../lxc/mainloop.h \ + ../lxc/monitor.c ../lxc/monitor.h \ ../lxc/namespace.c ../lxc/namespace.h \ ../lxc/network.c ../lxc/network.h \ ../lxc/nl.c ../lxc/nl.h \ ../lxc/parse.c ../lxc/parse.h \ ../lxc/process_utils.c ../lxc/process_utils.h \ ../lxc/ringbuf.c ../lxc/ringbuf.h \ + ../lxc/start.c ../lxc/start.h \ ../lxc/string_utils.c ../lxc/string_utils.h if ENABLE_SECCOMP lxc_test_parse_config_file_SOURCES += ../lxc/seccomp.c ../lxc/lxcseccomp.h @@ -180,16 +203,20 @@ lxc_test_utils_SOURCES = lxc-test-utils.c \ ../lxc/conf.c ../lxc/conf.h \ ../lxc/confile.c ../lxc/confile.h \ ../lxc/confile_utils.c ../lxc/confile_utils.h \ + ../lxc/error.c ../lxc/error.h \ ../lxc/file_utils.c ../lxc/file_utils.h \ ../lxc/initutils.c ../lxc/initutils.h \ ../lxc/log.c ../lxc/log.h \ + ../lxc/lxclock.c ../lxc/lxclock.h \ ../lxc/mainloop.c ../lxc/mainloop.h \ + ../lxc/monitor.c ../lxc/monitor.h \ ../lxc/namespace.c ../lxc/namespace.h \ ../lxc/network.c ../lxc/network.h \ ../lxc/nl.c ../lxc/nl.h \ ../lxc/parse.c ../lxc/parse.h \ ../lxc/process_utils.c ../lxc/process_utils.h \ ../lxc/ringbuf.c ../lxc/ringbuf.h \ + ../lxc/start.c ../lxc/start.h \ ../lxc/string_utils.c ../lxc/string_utils.h if ENABLE_SECCOMP lxc_test_utils_SOURCES += ../lxc/seccomp.c ../lxc/lxcseccomp.h