Patchwork [2/3] move two variable declarations out of vl.c

login
register
mail settings
Submitter Paolo Bonzini
Date March 19, 2010, 10:35 a.m.
Message ID <1268994909-7107-3-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/48130/
State New
Headers show

Comments

Paolo Bonzini - March 19, 2010, 10:35 a.m.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/i8259.c   |    1 +
 hw/isa-bus.c |    1 +
 vl.c         |    6 ------
 3 files changed, 2 insertions(+), 6 deletions(-)

Patch

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 f2056f8..fd17795 100644
--- a/vl.c
+++ b/vl.c
@@ -305,12 +305,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;
-
-/***********************************************************/
 void hw_error(const char *fmt, ...)
 {
     va_list ap;