>From 1b31992e04e8006fb0087d25b186800f48babbe0 Mon Sep 17 00:00:00 2001 From: Riku Voipio 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 --- 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