[Qemu-devel] [5240] Fix warnings that would be caused by ld flag --warn-common

[Qemu-devel] [5240] Fix warnings that would be caused by ld flag --warn-common

[Blue Swirl]

Revision: 5240
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5240
Author:   blueswir1
Date:     2008-09-17 19:04:14 +0000 (Wed, 17 Sep 2008)

Log Message:
-----------
Fix warnings that would be caused by ld flag --warn-common

Modified Paths:
--------------
    trunk/block.c
    trunk/block_int.h
    trunk/hw/arm-misc.h
    trunk/hw/armv7m_nvic.c

Modified: trunk/block.c
===================================================================
--- trunk/block.c	2008-09-17 00:21:05 UTC (rev 5239)
+++ trunk/block.c	2008-09-17 19:04:14 UTC (rev 5240)
@@ -54,6 +54,8 @@
 static int bdrv_write_em(BlockDriverState *bs, int64_t sector_num,
                          const uint8_t *buf, int nb_sectors);
 
+BlockDriverState *bdrv_first;
+
 static BlockDriver *first_drv;
 
 int path_is_absolute(const char *path)

Modified: trunk/block_int.h
===================================================================
--- trunk/block_int.h	2008-09-17 00:21:05 UTC (rev 5239)
+++ trunk/block_int.h	2008-09-17 19:04:14 UTC (rev 5240)
@@ -145,6 +145,6 @@
                    void *opaque);
 void qemu_aio_release(void *p);
 
-BlockDriverState *bdrv_first;
+extern BlockDriverState *bdrv_first;
 
 #endif /* BLOCK_INT_H */

Modified: trunk/hw/arm-misc.h
===================================================================
--- trunk/hw/arm-misc.h	2008-09-17 00:21:05 UTC (rev 5239)
+++ trunk/hw/arm-misc.h	2008-09-17 19:04:14 UTC (rev 5240)
@@ -37,7 +37,7 @@
 
 /* Multiplication factor to convert from system clock ticks to qemu timer
    ticks.  */
-int system_clock_scale;
+extern int system_clock_scale;
 qemu_irq *armv7m_nvic_init(CPUState *env);
 
 /* stellaris_enent.c */

Modified: trunk/hw/armv7m_nvic.c
===================================================================
--- trunk/hw/armv7m_nvic.c	2008-09-17 00:21:05 UTC (rev 5239)
+++ trunk/hw/armv7m_nvic.c	2008-09-17 19:04:14 UTC (rev 5240)
@@ -50,6 +50,8 @@
 #define SYSTICK_CLKSOURCE (1 << 2)
 #define SYSTICK_COUNTFLAG (1 << 16)
 
+int system_clock_scale;
+
 /* Conversion factor from qemu timer to SysTick frequencies.  */
 static inline int64_t systick_scale(nvic_state *s)
 {