From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LPJvo-0007RE-CQ
	for qemu-devel@nongnu.org; Tue, 20 Jan 2009 11:58:28 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LPJvm-0007QX-Qp
	for qemu-devel@nongnu.org; Tue, 20 Jan 2009 11:58:27 -0500
Received: from [199.232.76.173] (port=46183 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LPJvm-0007QR-Bd
	for qemu-devel@nongnu.org; Tue, 20 Jan 2009 11:58:26 -0500
Received: from mail-bw0-f16.google.com ([209.85.218.16]:34972)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <blauwirbel@gmail.com>) id 1LPJvl-0000u4-NZ
	for qemu-devel@nongnu.org; Tue, 20 Jan 2009 11:58:26 -0500
Received: by bwz9 with SMTP id 9so341bwz.8
	for <qemu-devel@nongnu.org>; Tue, 20 Jan 2009 08:58:21 -0800 (PST)
MIME-Version: 1.0
In-Reply-To: <20090120155810.GB1230@kos.to>
References: <E1LNan1-0002KY-9o@cvs.savannah.gnu.org>
	<20090120155810.GB1230@kos.to>
Date: Tue, 20 Jan 2009 18:58:11 +0200
Message-ID: <f43fc5580901200858h7be0f10fo210fb77d7209359b@mail.gmail.com>
Subject: Re: [Qemu-devel] [6338] Convert references to logfile/loglevel to use
	qemu_log*() macros
From: Blue Swirl <blauwirbel@gmail.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

On 1/20/09, Riku Voipio <riku.voipio@iki.fi> wrote:
> > Modified: trunk/linux-user/main.c
>  > ===================================================================
>  > --- trunk/linux-user/main.c   2009-01-15 22:17:38 UTC (rev 6337)
>  > +++ trunk/linux-user/main.c   2009-01-15 22:34:14 UTC (rev 6338)
>  > @@ -1057,10 +1057,8 @@
>  >  do {                                                                          \
>  >      fprintf(stderr, fmt , ##args);                                            \
>  >      cpu_dump_state(env, stderr, fprintf, 0);                                  \
>  > -    if (loglevel != 0) {                                                      \
>  > -        fprintf(logfile, fmt , ##args);                                       \
>  > -        cpu_dump_state(env, logfile, fprintf, 0);                             \
>  > -    }                                                                         \
>  > +    qemu_log(fmt, ##args);                                                   \
>  > +    log_cpu_state(env, 0);                                                      \
>  >  } while (0)
>  >
>  >  void cpu_loop(CPUPPCState *env)
>  > @@ -2396,21 +2394,19 @@
>  >
>  >      free(target_environ);
>  >
>  > -    if (loglevel) {
>  > -        page_dump(logfile);
>  > +    log_page_dump();
>  >
>  > -        fprintf(logfile, "start_brk   0x" TARGET_ABI_FMT_lx "\n", info->start_brk);
>  > -        fprintf(logfile, "end_code    0x" TARGET_ABI_FMT_lx "\n", info->end_code);
>  > -        fprintf(logfile, "start_code  0x" TARGET_ABI_FMT_lx "\n",
>  > -                info->start_code);
>  > -        fprintf(logfile, "start_data  0x" TARGET_ABI_FMT_lx "\n",
>  > -                info->start_data);
>  > -        fprintf(logfile, "end_data    0x" TARGET_ABI_FMT_lx "\n", info->end_data);
>  > -        fprintf(logfile, "start_stack 0x" TARGET_ABI_FMT_lx "\n",
>  > -                info->start_stack);
>  > -        fprintf(logfile, "brk         0x" TARGET_ABI_FMT_lx "\n", info->brk);
>  > -        fprintf(logfile, "entry       0x" TARGET_ABI_FMT_lx "\n", info->entry);
>  > -    }
>  > +    qemu_log("start_brk   0x" TARGET_ABI_FMT_lx "\n", info->start_brk);
>  > +    qemu_log("end_code    0x" TARGET_ABI_FMT_lx "\n", info->end_code);
>  > +    qemu_log("start_code  0x" TARGET_ABI_FMT_lx "\n",
>  > +            info->start_code);
>  > +    qemu_log("start_data  0x" TARGET_ABI_FMT_lx "\n",
>  > +            info->start_data);
>  > +    qemu_log("end_data    0x" TARGET_ABI_FMT_lx "\n", info->end_data);
>  > +    qemu_log("start_stack 0x" TARGET_ABI_FMT_lx "\n",
>  > +            info->start_stack);
>  > +    qemu_log("brk         0x" TARGET_ABI_FMT_lx "\n", info->brk);
>  > +    qemu_log("entry       0x" TARGET_ABI_FMT_lx "\n", info->entry);
>  >
>  >      target_set_brk(info->brk);
>  >      syscall_init();
>
>
> This breaks linux-user when called without -d option. The attached patch
>  fixes it for me(tm).

Thanks, applied. I also fixed bsd-user.