Commit 4f7631cfb540b452a01a0375716b51bcc933ef53
1 parent
62a46c61
initial APIC support (only for x86_64 target now)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1185 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
9 additions
and
0 deletions
hw/i8259.c
| @@ -197,6 +197,15 @@ int cpu_get_pic_interrupt(CPUState *env) | @@ -197,6 +197,15 @@ int cpu_get_pic_interrupt(CPUState *env) | ||
| 197 | { | 197 | { |
| 198 | int irq, irq2, intno; | 198 | int irq, irq2, intno; |
| 199 | 199 | ||
| 200 | +#ifdef TARGET_X86_64 | ||
| 201 | + intno = apic_get_interrupt(env); | ||
| 202 | + if (intno >= 0) { | ||
| 203 | + /* set irq request if a PIC irq is still pending */ | ||
| 204 | + /* XXX: improve that */ | ||
| 205 | + pic_update_irq(); | ||
| 206 | + return intno; | ||
| 207 | + } | ||
| 208 | +#endif | ||
| 200 | /* read the irq from the PIC */ | 209 | /* read the irq from the PIC */ |
| 201 | 210 | ||
| 202 | irq = pic_get_irq(&pics[0]); | 211 | irq = pic_get_irq(&pics[0]); |