提交 7ee930d0 编写于 作者: B blueswir1

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

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5240 c046a42c-6fe2-441c-8c8c-71466251a162
上级 5628a626
...@@ -54,6 +54,8 @@ static int bdrv_read_em(BlockDriverState *bs, int64_t sector_num, ...@@ -54,6 +54,8 @@ static int bdrv_read_em(BlockDriverState *bs, int64_t sector_num,
static int bdrv_write_em(BlockDriverState *bs, int64_t sector_num, static int bdrv_write_em(BlockDriverState *bs, int64_t sector_num,
const uint8_t *buf, int nb_sectors); const uint8_t *buf, int nb_sectors);
BlockDriverState *bdrv_first;
static BlockDriver *first_drv; static BlockDriver *first_drv;
int path_is_absolute(const char *path) int path_is_absolute(const char *path)
......
...@@ -145,6 +145,6 @@ void *qemu_aio_get(BlockDriverState *bs, BlockDriverCompletionFunc *cb, ...@@ -145,6 +145,6 @@ void *qemu_aio_get(BlockDriverState *bs, BlockDriverCompletionFunc *cb,
void *opaque); void *opaque);
void qemu_aio_release(void *p); void qemu_aio_release(void *p);
BlockDriverState *bdrv_first; extern BlockDriverState *bdrv_first;
#endif /* BLOCK_INT_H */ #endif /* BLOCK_INT_H */
...@@ -37,7 +37,7 @@ void arm_load_kernel(CPUState *env, struct arm_boot_info *info); ...@@ -37,7 +37,7 @@ void arm_load_kernel(CPUState *env, struct arm_boot_info *info);
/* Multiplication factor to convert from system clock ticks to qemu timer /* Multiplication factor to convert from system clock ticks to qemu timer
ticks. */ ticks. */
int system_clock_scale; extern int system_clock_scale;
qemu_irq *armv7m_nvic_init(CPUState *env); qemu_irq *armv7m_nvic_init(CPUState *env);
/* stellaris_enent.c */ /* stellaris_enent.c */
......
...@@ -50,6 +50,8 @@ typedef struct { ...@@ -50,6 +50,8 @@ typedef struct {
#define SYSTICK_CLKSOURCE (1 << 2) #define SYSTICK_CLKSOURCE (1 << 2)
#define SYSTICK_COUNTFLAG (1 << 16) #define SYSTICK_COUNTFLAG (1 << 16)
int system_clock_scale;
/* Conversion factor from qemu timer to SysTick frequencies. */ /* Conversion factor from qemu timer to SysTick frequencies. */
static inline int64_t systick_scale(nvic_state *s) static inline int64_t systick_scale(nvic_state *s)
{ {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册