diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2010-04-01 19:57:09 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2010-04-09 18:55:54 +0200 |
| commit | fbe3288df645b3b81850008327e3b714a5ca7036 (patch) | |
| tree | 3e8801361886e4f88779b0f3ec8f20bd37dd4a80 | |
| parent | 0706a4dcce88942462ca85aa2dcea0795ee655c4 (diff) | |
move two variable declarations out of vl.c
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
| -rw-r--r-- | hw/i8259.c | 1 | ||||
| -rw-r--r-- | hw/isa-bus.c | 1 | ||||
| -rw-r--r-- | vl.c | 4 |
3 files changed, 2 insertions, 4 deletions
diff --git a/hw/i8259.c b/hw/i8259.c index 3de22e343e..37ef04e519 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 4d489d2059..4e306de9cf 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); @@ -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) { |