From: Riku Voipio <riku.voipio@iki.fi>
To: qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [6338] Convert references to logfile/loglevel to use qemu_log*() macros
Date: Tue, 20 Jan 2009 17:58:10 +0200 [thread overview]
Message-ID: <20090120155810.GB1230@kos.to> (raw)
In-Reply-To: <E1LNan1-0002KY-9o@cvs.savannah.gnu.org>
[-- Attachment #1: Type: text/plain, Size: 2757 bytes --]
> 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).
[-- Attachment #2: 0001-linux-user-fix-breakage-from-r6338.patch --]
[-- Type: text/plain, Size: 2080 bytes --]
>From 1b31992e04e8006fb0087d25b186800f48babbe0 Mon Sep 17 00:00:00 2001
From: Riku Voipio <riku.voipio@iki.fi>
Date: Tue, 20 Jan 2009 17:22:07 +0200
Subject: [PATCH] linux-user: fix breakage from r6338
log_page_dump() will segfault is logfile is NULL.
Signed-off-by: Riku Voipio <riku.voipio@iki.fi>
---
linux-user/main.c | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/linux-user/main.c b/linux-user/main.c
index 5685b37..59da5fd 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -2394,19 +2394,22 @@ int main(int argc, char **argv, char **envp)
free(target_environ);
- log_page_dump();
-
- 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);
+ if(qemu_log_enabled())
+ {
+ log_page_dump();
+
+ 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();
--
1.5.6.3
next prev parent reply other threads:[~2009-01-20 15:58 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-15 22:34 [Qemu-devel] [6338] Convert references to logfile/loglevel to use qemu_log*() macros Anthony Liguori
2009-01-20 15:58 ` Riku Voipio [this message]
2009-01-20 16:58 ` Blue Swirl
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090120155810.GB1230@kos.to \
--to=riku.voipio@iki.fi \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.