From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46974) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5qzf-0005lL-65 for qemu-devel@nongnu.org; Fri, 19 Jun 2015 03:45:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5qze-0001u8-4d for qemu-devel@nongnu.org; Fri, 19 Jun 2015 03:45:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60241) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5qzd-0001tJ-V1 for qemu-devel@nongnu.org; Fri, 19 Jun 2015 03:45:42 -0400 From: Paolo Bonzini Date: Fri, 19 Jun 2015 09:45:22 +0200 Message-Id: <1434699936-4433-2-git-send-email-pbonzini@redhat.com> In-Reply-To: <1434699936-4433-1-git-send-email-pbonzini@redhat.com> References: <1434699936-4433-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 01/15] qemu-log: Open file for logging when specified List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Pranith Kumar , Markus Armbruster , Luiz Capitulino From: Pranith Kumar qemu-log defaults to stderr when there is no '-D' option mentioned on command line. When '-D' option is specified, we also need to specify '-d' option for it to use the specified logfile. When using monitor to enable logging this is troublesome since there will be no '-d' option because of which monitor dumps the logs to stderr. Fix this by opening the log file when '-D' is specified on the command line. Also fix an ancient comment which does not hold true since changing location and log level has now been streamlined. Signed-off-by: Pranith Kumar CC: Paolo Bonzini CC: Luiz Capitulino CC: Markus Armbruster CC: Peter Maydell Message-Id: <1433946024-18439-1-git-send-email-bobby.prani@gmail.com> Signed-off-by: Paolo Bonzini --- vl.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/vl.c b/vl.c index 2201e27..63ce07f 100644 --- a/vl.c +++ b/vl.c @@ -3916,17 +3916,14 @@ int main(int argc, char **argv, char **envp) exit(0); } - /* Open the logfile at this point, if necessary. We can't open the logfile - * when encountering either of the logging options (-d or -D) because the - * other one may be encountered later on the command line, changing the - * location or level of logging. + /* Open the logfile at this point and set the log mask if necessary. */ + if (log_file) { + qemu_set_log_filename(log_file); + } + if (log_mask) { int mask; - if (log_file) { - qemu_set_log_filename(log_file); - } - mask = qemu_str_to_log_mask(log_mask); if (!mask) { qemu_print_log_usage(stdout); -- 2.4.3