move two variable declarations out of vl.c
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
This commit is contained in:
parent
0706a4dcce
commit
fbe3288df6
|
@ -68,6 +68,7 @@ static int irq_level[16];
|
||||||
#ifdef DEBUG_IRQ_COUNT
|
#ifdef DEBUG_IRQ_COUNT
|
||||||
static uint64_t irq_count[16];
|
static uint64_t irq_count[16];
|
||||||
#endif
|
#endif
|
||||||
|
PicState2 *isa_pic;
|
||||||
|
|
||||||
/* set irq level. If an edge is detected, then the IRR is set to 1 */
|
/* 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)
|
static inline void pic_set_irq1(PicState *s, int irq, int level)
|
||||||
|
|
|
@ -28,6 +28,7 @@ struct ISABus {
|
||||||
uint32_t assigned;
|
uint32_t assigned;
|
||||||
};
|
};
|
||||||
static ISABus *isabus;
|
static ISABus *isabus;
|
||||||
|
target_phys_addr_t isa_mem_base = 0;
|
||||||
|
|
||||||
static void isabus_dev_print(Monitor *mon, DeviceState *dev, int indent);
|
static void isabus_dev_print(Monitor *mon, DeviceState *dev, int indent);
|
||||||
|
|
||||||
|
|
4
vl.c
4
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)
|
static void set_proc_name(const char *s)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue