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 /darwin-user | |
parent | 6cec5487990bf3f1f22b3fcb871978255e92ae0d (diff) |
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 'darwin-user')
-rw-r--r-- | darwin-user/commpage.c | 4 | ||||
-rw-r--r-- | darwin-user/machload.c | 4 | ||||
-rw-r--r-- | darwin-user/main.c | 6 | ||||
-rw-r--r-- | darwin-user/syscall.c | 4 |
4 files changed, 8 insertions, 10 deletions
diff --git a/darwin-user/commpage.c b/darwin-user/commpage.c index 58f429c19..8961bef44 100644 --- a/darwin-user/commpage.c +++ b/darwin-user/commpage.c @@ -35,9 +35,9 @@ //#define DEBUG_COMMPAGE #ifdef DEBUG_COMMPAGE -# define DPRINTF(...) do { if(loglevel) fprintf(logfile, __VA_ARGS__); printf(__VA_ARGS__); } while(0) +# define DPRINTF(...) do { qemu_log(__VA_ARGS__); printf(__VA_ARGS__); } while(0) #else -# define DPRINTF(...) do { if(loglevel) fprintf(logfile, __VA_ARGS__); } while(0) +# define DPRINTF(...) do { qemu_log(__VA_ARGS__); } while(0) #endif /******************************************************************** diff --git a/darwin-user/machload.c b/darwin-user/machload.c index 9d7aaf540..794aefa17 100644 --- a/darwin-user/machload.c +++ b/darwin-user/machload.c @@ -39,9 +39,9 @@ //#define DEBUG_MACHLOAD #ifdef DEBUG_MACHLOAD -# define DPRINTF(...) do { if(loglevel) fprintf(logfile, __VA_ARGS__); printf(__VA_ARGS__); } while(0) +# define DPRINTF(...) do { qemu_log(__VA_ARGS__); printf(__VA_ARGS__); } while(0) #else -# define DPRINTF(...) do { if(loglevel) fprintf(logfile, __VA_ARGS__); } while(0) +# define DPRINTF(...) do { qemu_log(__VA_ARGS__); } while(0) #endif # define check_mach_header(x) (x.magic == MH_CIGAM) diff --git a/darwin-user/main.c b/darwin-user/main.c index b1011cda9..24e738b3a 100644 --- a/darwin-user/main.c +++ b/darwin-user/main.c @@ -160,10 +160,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) diff --git a/darwin-user/syscall.c b/darwin-user/syscall.c index 8d56de7ed..130d33c6b 100644 --- a/darwin-user/syscall.c +++ b/darwin-user/syscall.c @@ -69,7 +69,7 @@ # define DEBUG_ENABLE_ALL() static int __DEBUG_qemu_user_force_enable = 1 DEBUG_ENABLE_ALL(); -# define DPRINTF(...) do { if(loglevel) fprintf(logfile, __VA_ARGS__); \ +# define DPRINTF(...) do { qemu_log(__VA_ARGS__); \ if(__DEBUG_qemu_user_force_enable) fprintf(stderr, __VA_ARGS__); \ } while(0) #else @@ -77,7 +77,7 @@ # define DEBUG_BEGIN_ENABLE # define DEBUG_END_ENABLE -# define DPRINTF(...) do { if(loglevel) fprintf(logfile, __VA_ARGS__); } while(0) +# define DPRINTF(...) do { qemu_log(__VA_ARGS__); } while(0) #endif enum { |