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 7240f82089bf89646edaaa923fa3f20217ae4728..462bbdac22aec699cf7f6f0adf2c9b8447bb6cdc 100644 (file)
--- 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 449b13bf30b30ae3a0469d36b1b1531ba15b4252..629e91470bc425b32fa2f475ca635aa4977a8a24 100644 (file)
--- 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 1499af78663bc218e5c36b0bea50e38b525ea8fe..6551b02e0bbac934fa96da2b8d69c3c946329dec 100644 (file)
--- 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 fd247aa87d7c733d33bc659d73ee59cad35291ea..c1bc486e053660917e0cfdd2d8fb0c923a43d5ef 100644 (file)
--- 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 3e3ea5676ea7bcbe2c69936a343c3f1046d40b37..296e07132cfe51e33dce3203d39f24cff3e56ed4 100644 (file)
--- 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 b6b25b7ca8af8b1bb2974d2fa676a2e04079701c..25bcfd82fca6efaa54bdd7830fbca607a7749b55 100644 (file)
--- 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 ee821f5b5b1a35782239a12f884ba90f572f8c2b..d240f0e2932a2120de4accb4ad696f3d8709d9f5 100644 (file)
--- 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 88ba6b03dd99e68ecc75146810c042a0ec36b45a..3c35d1783ede0fcb1eda93a7e27395560b0c119c 100644 (file)
--- 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