[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [5026] i386: fix isapc machine
From: |
Aurelien Jarno |
Subject: |
[Qemu-devel] [5026] i386: fix isapc machine |
Date: |
Tue, 19 Aug 2008 12:55:22 +0000 |
Revision: 5026
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5026
Author: aurel32
Date: 2008-08-19 12:55:20 +0000 (Tue, 19 Aug 2008)
Log Message:
-----------
i386: fix isapc machine
- cirrus vga: enable graphic console
- pc: don't use apic for interrupts on ISA machine
Signed-off-by: Aurelien Jarno <address@hidden>
Modified Paths:
--------------
trunk/hw/cirrus_vga.c
trunk/hw/pc.c
Modified: trunk/hw/cirrus_vga.c
===================================================================
--- trunk/hw/cirrus_vga.c 2008-08-18 18:00:31 UTC (rev 5025)
+++ trunk/hw/cirrus_vga.c 2008-08-19 12:55:20 UTC (rev 5026)
@@ -3228,6 +3228,8 @@
vga_common_init((VGAState *)s,
ds, vga_ram_base, vga_ram_offset, vga_ram_size);
cirrus_init_common(s, CIRRUS_ID_CLGD5430, 0);
+ s->console = graphic_console_init(s->ds, s->update, s->invalidate,
+ s->screen_dump, s->text_update, s);
/* XXX ISA-LFB support */
}
Modified: trunk/hw/pc.c
===================================================================
--- trunk/hw/pc.c 2008-08-18 18:00:31 UTC (rev 5025)
+++ trunk/hw/pc.c 2008-08-19 12:55:20 UTC (rev 5026)
@@ -121,10 +121,14 @@
if (!level)
return;
- while (env) {
- if (apic_accept_pic_intr(env))
- apic_local_deliver(env, APIC_LINT0);
- env = env->next_cpu;
+ if (env->apic_state) {
+ while (env) {
+ if (apic_accept_pic_intr(env))
+ apic_local_deliver(env, APIC_LINT0);
+ env = env->next_cpu;
+ }
+ } else {
+ cpu_interrupt(env, CPU_INTERRUPT_HARD);
}
}
- [Qemu-devel] [5026] i386: fix isapc machine,
Aurelien Jarno <=