Re: [Qemu-devel] [6338] Convert references to logfile/loglevel to use qemu_log*() macros

[Blue Swirl]

On 1/20/09, Riku Voipio <address@hidden> 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.