From fbe3288df645b3b81850008327e3b714a5ca7036 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 1 Apr 2010 19:57:09 +0200 Subject: [PATCH] move two variable declarations out of vl.c Signed-off-by: Paolo Bonzini Signed-off-by: Aurelien Jarno --- hw/i8259.c | 1 + hw/isa-bus.c | 1 + vl.c | 4 ---- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/i8259.c b/hw/i8259.c index 3de22e3..37ef04e 100644 --- a/hw/i8259.c +++ b/hw/i8259.c @@ -68,6 +68,7 @@ static int irq_level[16]; #ifdef DEBUG_IRQ_COUNT static uint64_t irq_count[16]; #endif +PicState2 *isa_pic; /* set irq level. If an edge is detected, then the IRR is set to 1 */ static inline void pic_set_irq1(PicState *s, int irq, int level) diff --git a/hw/isa-bus.c b/hw/isa-bus.c index 4d489d2..4e306de 100644 --- a/hw/isa-bus.c +++ b/hw/isa-bus.c @@ -28,6 +28,7 @@ struct ISABus { uint32_t assigned; }; static ISABus *isabus; +target_phys_addr_t isa_mem_base = 0; static void isabus_dev_print(Monitor *mon, DeviceState *dev, int indent); diff --git a/vl.c b/vl.c index 546c631..2c5e9ef 100644 --- a/vl.c +++ b/vl.c @@ -292,10 +292,6 @@ static int default_driver_check(QemuOpts *opts, void *opaque) } /***********************************************************/ -/* x86 ISA bus support */ - -target_phys_addr_t isa_mem_base = 0; -PicState2 *isa_pic; static void set_proc_name(const char *s) { -- 2.7.4