From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sukadev Bhattiprolu Subject: [PATCH 03/14][user-cr] Add app_restart_args->ulogfd Date: Thu, 18 Mar 2010 23:32:08 -0700 Message-ID: <20100319063208.GC24844@us.ibm.com> References: <20100319062659.GA23838@us.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline In-Reply-To: <20100319062659.GA23838-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: containers-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Oren Laadan Cc: Containers List-Id: containers.vger.kernel.org From: Sukadev Bhattiprolu Date: Thu, 4 Mar 2010 22:33:34 -0800 Subject: [PATCH 03/14][user-cr] Add app_restart_args->ulogfd Add a 'ulogfd' field in struct app_restart_args so other callers of app_restart() can also choose a file descriptor for the log messages from app_restart(). Signed-off-by: Sukadev Bhattiprolu --- restart.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/restart.c b/restart.c index 9d16a4d..5ae5ec4 100644 --- a/restart.c +++ b/restart.c @@ -385,6 +385,7 @@ struct app_restart_args { char *freezer; int infd; int klogfd; + int ulogfd; long warn; int debug; int verbose; @@ -497,6 +498,7 @@ static void parse_args(struct app_restart_args *args, int argc, char *argv[]) args->wait = 1; args->infd = -1; args->klogfd = -1; + args->ulogfd = fileno(stdout); args->warn = CKPT_COND_WARN; args->fail = CKPT_COND_FAIL; no_pidns = 0; @@ -819,6 +821,7 @@ int app_restart(struct app_restart_args *args) global_debug = args->debug; global_verbose = args->verbose; + global_ulogfd = args->ulogfd; /* input file descriptor (default: stdin) */ if (args->infd >= 0) { -- 1.6.0.4