[Qemu-devel] [5413] Use qemu-log.h

[Blue Swirl]

Revision: 5413
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5413
Author:   blueswir1
Date:     2008-10-04 07:20:07 +0000 (Sat, 04 Oct 2008)

Log Message:
-----------
Use qemu-log.h

Modified Paths:
--------------
    trunk/darwin-user/qemu.h
    trunk/hw/mips_malta.c
    trunk/hw/mips_r4k.c
    trunk/hw/ppc.c
    trunk/hw/ppc405_boards.c
    trunk/hw/ppc405_uc.c
    trunk/hw/ppc4xx_devs.c
    trunk/hw/ppc_prep.c

Modified: trunk/darwin-user/qemu.h
===================================================================
--- trunk/darwin-user/qemu.h    2008-10-04 03:32:00 UTC (rev 5412)
+++ trunk/darwin-user/qemu.h    2008-10-04 07:20:07 UTC (rev 5413)
@@ -109,8 +109,7 @@
 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);

Modified: trunk/hw/mips_malta.c
===================================================================
--- trunk/hw/mips_malta.c       2008-10-04 03:32:00 UTC (rev 5412)
+++ trunk/hw/mips_malta.c       2008-10-04 07:20:07 UTC (rev 5413)
@@ -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;

Modified: trunk/hw/mips_r4k.c
===================================================================
--- trunk/hw/mips_r4k.c 2008-10-04 03:32:00 UTC (rev 5412)
+++ trunk/hw/mips_r4k.c 2008-10-04 07:20:07 UTC (rev 5413)
@@ -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 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 */

Modified: trunk/hw/ppc.c
===================================================================
--- trunk/hw/ppc.c      2008-10-04 03:32:00 UTC (rev 5412)
+++ trunk/hw/ppc.c      2008-10-04 07:20:07 UTC (rev 5413)
@@ -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);
 

Modified: trunk/hw/ppc405_boards.c
===================================================================
--- trunk/hw/ppc405_boards.c    2008-10-04 03:32:00 UTC (rev 5412)
+++ trunk/hw/ppc405_boards.c    2008-10-04 07:20:07 UTC (rev 5413)
@@ -29,10 +29,8 @@
 #include "sysemu.h"
 #include "block.h"
 #include "boards.h"
+#include "qemu-log.h"
 
-extern int loglevel;
-extern FILE *logfile;
-
 #define BIOS_FILENAME "ppc405_rom.bin"
 #undef BIOS_SIZE
 #define BIOS_SIZE (2048 * 1024)

Modified: trunk/hw/ppc405_uc.c
===================================================================
--- trunk/hw/ppc405_uc.c        2008-10-04 03:32:00 UTC (rev 5412)
+++ trunk/hw/ppc405_uc.c        2008-10-04 07:20:07 UTC (rev 5413)
@@ -27,10 +27,8 @@
 #include "pc.h"
 #include "qemu-timer.h"
 #include "sysemu.h"
+#include "qemu-log.h"
 
-extern int loglevel;
-extern FILE *logfile;
-
 #define DEBUG_OPBA
 #define DEBUG_SDRAM
 #define DEBUG_GPIO

Modified: trunk/hw/ppc4xx_devs.c
===================================================================
--- trunk/hw/ppc4xx_devs.c      2008-10-04 03:32:00 UTC (rev 5412)
+++ trunk/hw/ppc4xx_devs.c      2008-10-04 07:20:07 UTC (rev 5413)
@@ -25,10 +25,8 @@
 #include "ppc.h"
 #include "ppc4xx.h"
 #include "sysemu.h"
+#include "qemu-log.h"
 
-extern int loglevel;
-extern FILE *logfile;
-
 //#define DEBUG_MMIO
 //#define DEBUG_UNASSIGNED
 #define DEBUG_UIC

Modified: trunk/hw/ppc_prep.c
===================================================================
--- trunk/hw/ppc_prep.c 2008-10-04 03:32:00 UTC (rev 5412)
+++ trunk/hw/ppc_prep.c 2008-10-04 07:20:07 UTC (rev 5413)
@@ -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