diff options
| author | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-01-15 22:34:14 +0000 |
|---|---|---|
| committer | aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-01-15 22:34:14 +0000 |
| commit | 93fcfe39a0383377e647b821c9f165fd927cd4e0 (patch) | |
| tree | 0c89165b2c8331045c6da46eb2dc4154ef69293a /linux-user | |
| parent | 6cec5487990bf3f1f22b3fcb871978255e92ae0d (diff) | |
| download | qemu-93fcfe39a0383377e647b821c9f165fd927cd4e0.tar.gz | |
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 <ehabkost@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6338 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'linux-user')
| -rw-r--r-- | linux-user/elfload.c | 2 | ||||
| -rw-r--r-- | linux-user/main.c | 34 | ||||
| -rw-r--r-- | linux-user/vm86.c | 2 |
3 files changed, 17 insertions, 21 deletions
diff --git a/linux-user/elfload.c b/linux-user/elfload.c index ba1d631063..6de30f4bc0 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1454,7 +1454,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/linux-user/main.c b/linux-user/main.c index 4b62d94a6c..5685b3724d 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -1057,10 +1057,8 @@ int ppc_dcr_write (ppc_dcr_t *dcr_env, int dcrn, target_ulong val) 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 @@ int main(int argc, char **argv, char **envp) 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(); diff --git a/linux-user/vm86.c b/linux-user/vm86.c index 960bf900ac..cc6c8c99dd 100644 --- a/linux-user/vm86.c +++ b/linux-user/vm86.c @@ -30,7 +30,7 @@ //#define DEBUG_VM86 #ifdef DEBUG_VM86 -# define LOG_VM86(...) fprintf(logfile, ## __VA_ARGS__); +# define LOG_VM86(...) qemu_log(__VA_ARGS__); #else # define LOG_VM86(...) do { } while (0) #endif |