fixed indentation and comments

Signed-off-by: Niklas Eiling <niklas.eiling@rwth-aachen.de>

diff --git a/src/lxc/criu.c b/src/lxc/criu.c
index 094b0ff4688331ae17a1c944036352b39fad51b7..3645baba91b2d0546eec55c1d8b00f55eb3f38fc 100644 (file)
--- a/src/lxc/criu.c
+++ b/src/lxc/criu.c
@@ -83,9 +83,9 @@ struct criu_opts {
         */
        char *console_name;
 
-    /* Address and port where a criu pageserver ist listening */
-    char *pageserver_address;
-    char *pageserver_port;
+       /* Address and port where a criu pageserver is listening */
+       char *pageserver_address;
+       char *pageserver_port;
 };
 
 static int load_tty_major_minor(char *directory, char *output, int len)
@@ -160,6 +160,10 @@ static void exec_criu(struct criu_opts *opts)
                if (opts->predump_dir)
                        static_args += 2;
 
+               /* --page-server --address <address> --port <port> */
+               if (opts->pageserver_address && opts->pageserver_port)
+                       static_args += 5;
+
                /* --leave-running (only for final dump) */
                if (strcmp(opts->action, "dump") == 0 && !opts->stop)
                        static_args++;
@@ -274,15 +278,15 @@ static void exec_criu(struct criu_opts *opts)
                if (opts->predump_dir) {
                        DECLARE_ARG("--prev-images-dir");
                        DECLARE_ARG(opts->predump_dir);
-        }
+               }
 
-        if (opts->pageserver_address && opts->pageserver_port) {
-            DECLARE_ARG("--page-server");
-            DECLARE_ARG("--address");
-            DECLARE_ARG(opts->pageserver_address);
-            DECLARE_ARG("--port");
-            DECLARE_ARG(opts->pageserver_port);
-        }
+               if (opts->pageserver_address && opts->pageserver_port) {
+                       DECLARE_ARG("--page-server");
+                       DECLARE_ARG("--address");
+                       DECLARE_ARG(opts->pageserver_address);
+                       DECLARE_ARG("--port");
+                       DECLARE_ARG(opts->pageserver_port);
+               }
 
                /* only for final dump */
                if (strcmp(opts->action, "dump") == 0 && !opts->stop)
@@ -826,8 +830,8 @@ static int save_tty_major_minor(char *directory, struct lxc_container *c, char *
 
 /* do one of either predump or a regular dump */
 static bool do_dump(struct lxc_container *c, char *mode, char *directory,
-                   bool stop, bool verbose, char *predump_dir, char *pageserver_address,
-            char *pageserver_port)
+                   bool stop, bool verbose, char *predump_dir,
+                   char *pageserver_address, char *pageserver_port)
 {
        pid_t pid;
 
@@ -853,8 +857,9 @@ static bool do_dump(struct lxc_container *c, char *mode, char *directory,
                os.verbose = verbose;
                os.predump_dir = predump_dir;
                os.console_name = c->lxc_conf->console.path;
-        os.pageserver_address = pageserver_address;
-        os.pageserver_port = pageserver_port;
+               os.pageserver_address = pageserver_address;
+               os.pageserver_port = pageserver_port;
+
                if (save_tty_major_minor(directory, c, os.tty_id, sizeof(os.tty_id)) < 0)
                        exit(1);
 
@@ -886,14 +891,12 @@ static bool do_dump(struct lxc_container *c, char *mode, char *directory,
        }
 }
 
-bool __criu_pre_dump(struct lxc_container *c, char *directory, bool verbose, char *predump_dir,
-                     char *pageserver_address, char *pageserver_port)
+bool __criu_pre_dump(struct lxc_container *c, char *directory, bool verbose, char *predump_dir, char *pageserver_address, char *pageserver_port)
 {
        return do_dump(c, "pre-dump", directory, false, verbose, predump_dir, pageserver_address, pageserver_port);
 }
 
-bool __criu_dump(struct lxc_container *c, char *directory, bool stop, bool verbose, char *predump_dir,
-                 char *pageserver_address, char *pageserver_port)
+bool __criu_dump(struct lxc_container *c, char *directory, bool stop, bool verbose, char *predump_dir, char *pageserver_address, char *pageserver_port)
 {
        char path[PATH_MAX];
        int ret;

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index 81e1cdf9895bf3356b79f843e02e8514fd5417ac..5c6d499339264ecb1212931cc818c2506f765e93 100644 (file)
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -3955,12 +3955,10 @@ static int do_lxcapi_migrate(struct lxc_container *c, unsigned int cmd,
 
        switch (cmd) {
        case MIGRATE_PRE_DUMP:
-               ret = !__criu_pre_dump(c, opts->directory, opts->verbose, opts->predump_dir,
-                               opts->pageserver_address, opts->pageserver_port);
+               ret = !__criu_pre_dump(c, opts->directory, opts->verbose, opts->predump_dir, opts->pageserver_address, opts->pageserver_port);
                break;
        case MIGRATE_DUMP:
-               ret = !__criu_dump(c, opts->directory, opts->stop, opts->verbose, opts->predump_dir,
-                           opts->pageserver_address, opts->pageserver_port);
+               ret = !__criu_dump(c, opts->directory, opts->stop, opts->verbose, opts->predump_dir, opts->pageserver_address, opts->pageserver_port);
                break;
        case MIGRATE_RESTORE:
                ret = !__criu_restore(c, opts->directory, opts->verbose);

diff --git a/src/lxc/lxccontainer.h b/src/lxc/lxccontainer.h
index a1df67a68be447e7711f0ce335e10ab5a7e35046..0e014bc800e031582b1b11488dac6f5ec5126225 100644 (file)
--- a/src/lxc/lxccontainer.h
+++ b/src/lxc/lxccontainer.h
@@ -882,8 +882,8 @@ struct migrate_opts {
 
        bool stop; /* stop the container after dump? */
        char *predump_dir; /* relative to directory above */
-    char *pageserver_address; /* where should memory pages be send? */
-    char *pageserver_port;
+       char *pageserver_address; /* where should memory pages be send? */
+       char *pageserver_port;
 };
 
 /*!