From: blueswir1 Date: Sat, 4 Oct 2008 07:20:07 +0000 (+0000) Subject: Use qemu-log.h X-Git-Tag: TizenStudio_2.0_p2.3.2~208^2~13873 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3b3fb32229c3dae1f399e3ebf45a6553c6824e07;p=sdk%2Femulator%2Fqemu.git Use qemu-log.h git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5413 c046a42c-6fe2-441c-8c8c-71466251a162 --- diff --git a/darwin-user/qemu.h b/darwin-user/qemu.h index 7240f82..462bbda 100644 --- a/darwin-user/qemu.h +++ b/darwin-user/qemu.h @@ -109,8 +109,7 @@ void cpu_loop(CPUState *env); void init_paths(const char *prefix); const char *path(const char *pathname); -extern int loglevel; -extern FILE *logfile; +#include "qemu-log.h" /* commpage.c */ void commpage_init(void); diff --git a/hw/mips_malta.c b/hw/mips_malta.c index 449b13b..629e914 100644 --- a/hw/mips_malta.c +++ b/hw/mips_malta.c @@ -36,6 +36,7 @@ #include "sysemu.h" #include "audio/audio.h" #include "boards.h" +#include "qemu-log.h" //#define DEBUG_BOARD_INIT @@ -59,8 +60,6 @@ #define MAX_IDE_BUS 2 -extern FILE *logfile; - typedef struct { uint32_t leds; uint32_t brk; diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c index 1499af78..6551b02 100644 --- a/hw/mips_r4k.c +++ b/hw/mips_r4k.c @@ -15,6 +15,7 @@ #include "sysemu.h" #include "boards.h" #include "flash.h" +#include "qemu-log.h" #ifdef TARGET_WORDS_BIGENDIAN #define BIOS_FILENAME "mips_bios.bin" @@ -35,8 +36,6 @@ static const int ide_irq[2] = { 14, 15 }; static int serial_io[MAX_SERIAL_PORTS] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8 }; static int serial_irq[MAX_SERIAL_PORTS] = { 4, 3, 4, 3 }; -extern FILE *logfile; - static PITState *pit; /* PIT i8254 */ /* i8254 PIT is attached to the IRQ0 at PIC i8259 */ diff --git a/hw/ppc.c b/hw/ppc.c index fd247aa..c1bc486 100644 --- a/hw/ppc.c +++ b/hw/ppc.c @@ -26,13 +26,11 @@ #include "qemu-timer.h" #include "sysemu.h" #include "nvram.h" +#include "qemu-log.h" //#define PPC_DEBUG_IRQ //#define PPC_DEBUG_TB -extern FILE *logfile; -extern int loglevel; - static void cpu_ppc_tb_stop (CPUState *env); static void cpu_ppc_tb_start (CPUState *env); diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c index 3e3ea56..296e071 100644 --- a/hw/ppc405_boards.c +++ b/hw/ppc405_boards.c @@ -29,9 +29,7 @@ #include "sysemu.h" #include "block.h" #include "boards.h" - -extern int loglevel; -extern FILE *logfile; +#include "qemu-log.h" #define BIOS_FILENAME "ppc405_rom.bin" #undef BIOS_SIZE diff --git a/hw/ppc405_uc.c b/hw/ppc405_uc.c index b6b25b7..25bcfd8 100644 --- a/hw/ppc405_uc.c +++ b/hw/ppc405_uc.c @@ -27,9 +27,7 @@ #include "pc.h" #include "qemu-timer.h" #include "sysemu.h" - -extern int loglevel; -extern FILE *logfile; +#include "qemu-log.h" #define DEBUG_OPBA #define DEBUG_SDRAM diff --git a/hw/ppc4xx_devs.c b/hw/ppc4xx_devs.c index ee821f5..d240f0e 100644 --- a/hw/ppc4xx_devs.c +++ b/hw/ppc4xx_devs.c @@ -25,9 +25,7 @@ #include "ppc.h" #include "ppc4xx.h" #include "sysemu.h" - -extern int loglevel; -extern FILE *logfile; +#include "qemu-log.h" //#define DEBUG_MMIO //#define DEBUG_UNASSIGNED diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c index 88ba6b0..3c35d17 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc_prep.c @@ -31,6 +31,7 @@ #include "pci.h" #include "ppc.h" #include "boards.h" +#include "qemu-log.h" //#define HARD_DEBUG_PPC_IO //#define DEBUG_PPC_IO @@ -44,9 +45,6 @@ #define KERNEL_LOAD_ADDR 0x01000000 #define INITRD_LOAD_ADDR 0x01800000 -extern int loglevel; -extern FILE *logfile; - #if defined (HARD_DEBUG_PPC_IO) && !defined (DEBUG_PPC_IO) #define DEBUG_PPC_IO #endif