Commit 3b3fb32229c3dae1f399e3ebf45a6553c6824e07
1 parent
fdb0d09d
Use qemu-log.h
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5413 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
8 changed files
with
8 additions
and
21 deletions
darwin-user/qemu.h
| ... | ... | @@ -109,8 +109,7 @@ void cpu_loop(CPUState *env); |
| 109 | 109 | void init_paths(const char *prefix); |
| 110 | 110 | const char *path(const char *pathname); |
| 111 | 111 | |
| 112 | -extern int loglevel; | |
| 113 | -extern FILE *logfile; | |
| 112 | +#include "qemu-log.h" | |
| 114 | 113 | |
| 115 | 114 | /* commpage.c */ |
| 116 | 115 | void commpage_init(void); | ... | ... |
hw/mips_malta.c
| ... | ... | @@ -36,6 +36,7 @@ |
| 36 | 36 | #include "sysemu.h" |
| 37 | 37 | #include "audio/audio.h" |
| 38 | 38 | #include "boards.h" |
| 39 | +#include "qemu-log.h" | |
| 39 | 40 | |
| 40 | 41 | //#define DEBUG_BOARD_INIT |
| 41 | 42 | |
| ... | ... | @@ -59,8 +60,6 @@ |
| 59 | 60 | |
| 60 | 61 | #define MAX_IDE_BUS 2 |
| 61 | 62 | |
| 62 | -extern FILE *logfile; | |
| 63 | - | |
| 64 | 63 | typedef struct { |
| 65 | 64 | uint32_t leds; |
| 66 | 65 | uint32_t brk; | ... | ... |
hw/mips_r4k.c
| ... | ... | @@ -15,6 +15,7 @@ |
| 15 | 15 | #include "sysemu.h" |
| 16 | 16 | #include "boards.h" |
| 17 | 17 | #include "flash.h" |
| 18 | +#include "qemu-log.h" | |
| 18 | 19 | |
| 19 | 20 | #ifdef TARGET_WORDS_BIGENDIAN |
| 20 | 21 | #define BIOS_FILENAME "mips_bios.bin" |
| ... | ... | @@ -35,8 +36,6 @@ static const int ide_irq[2] = { 14, 15 }; |
| 35 | 36 | static int serial_io[MAX_SERIAL_PORTS] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 }; |
| 36 | 37 | static int serial_irq[MAX_SERIAL_PORTS] = { 4, 3, 4, 3 }; |
| 37 | 38 | |
| 38 | -extern FILE *logfile; | |
| 39 | - | |
| 40 | 39 | static PITState *pit; /* PIT i8254 */ |
| 41 | 40 | |
| 42 | 41 | /* i8254 PIT is attached to the IRQ0 at PIC i8259 */ | ... | ... |
hw/ppc.c
| ... | ... | @@ -26,13 +26,11 @@ |
| 26 | 26 | #include "qemu-timer.h" |
| 27 | 27 | #include "sysemu.h" |
| 28 | 28 | #include "nvram.h" |
| 29 | +#include "qemu-log.h" | |
| 29 | 30 | |
| 30 | 31 | //#define PPC_DEBUG_IRQ |
| 31 | 32 | //#define PPC_DEBUG_TB |
| 32 | 33 | |
| 33 | -extern FILE *logfile; | |
| 34 | -extern int loglevel; | |
| 35 | - | |
| 36 | 34 | static void cpu_ppc_tb_stop (CPUState *env); |
| 37 | 35 | static void cpu_ppc_tb_start (CPUState *env); |
| 38 | 36 | ... | ... |
hw/ppc405_boards.c
hw/ppc405_uc.c
hw/ppc4xx_devs.c
hw/ppc_prep.c
| ... | ... | @@ -31,6 +31,7 @@ |
| 31 | 31 | #include "pci.h" |
| 32 | 32 | #include "ppc.h" |
| 33 | 33 | #include "boards.h" |
| 34 | +#include "qemu-log.h" | |
| 34 | 35 | |
| 35 | 36 | //#define HARD_DEBUG_PPC_IO |
| 36 | 37 | //#define DEBUG_PPC_IO |
| ... | ... | @@ -44,9 +45,6 @@ |
| 44 | 45 | #define KERNEL_LOAD_ADDR 0x01000000 |
| 45 | 46 | #define INITRD_LOAD_ADDR 0x01800000 |
| 46 | 47 | |
| 47 | -extern int loglevel; | |
| 48 | -extern FILE *logfile; | |
| 49 | - | |
| 50 | 48 | #if defined (HARD_DEBUG_PPC_IO) && !defined (DEBUG_PPC_IO) |
| 51 | 49 | #define DEBUG_PPC_IO |
| 52 | 50 | #endif | ... | ... |