From 93fcfe39a0383377e647b821c9f165fd927cd4e0 Mon Sep 17 00:00:00 2001 From: aliguori Date: Thu, 15 Jan 2009 22:34:14 +0000 Subject: Convert references to logfile/loglevel to use qemu_log*() macros This is a large patch that changes all occurrences of logfile/loglevel global variables to use the new qemu_log*() macros. Signed-off-by: Eduardo Habkost Signed-off-by: Anthony Liguori git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6338 c046a42c-6fe2-441c-8c8c-71466251a162 --- bsd-user/elfload.c | 2 +- bsd-user/main.c | 28 +++++++++++++--------------- 2 files changed, 14 insertions(+), 16 deletions(-) (limited to 'bsd-user') diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c index 82f172cc5..de7b4de7d 100644 --- a/bsd-user/elfload.c +++ b/bsd-user/elfload.c @@ -1456,7 +1456,7 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs, free(elf_phdata); - if (loglevel) + if (qemu_log_enabled()) load_symbols(&elf_ex, bprm->fd); if (interpreter_type != INTERPRETER_AOUT) close(bprm->fd); diff --git a/bsd-user/main.c b/bsd-user/main.c index 45f0bc582..b809f4326 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -533,21 +533,19 @@ int main(int argc, char **argv) free(target_environ); - if (loglevel) { - page_dump(logfile); - - 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); - } + 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(); -- cgit v1.2.3