From patchwork Sat Nov 3 18:49:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: kvm: fix Win2k boot without KVM Date: Sat, 03 Nov 2012 08:49:21 -0000 From: Blue Swirl X-Patchwork-Id: 196926 Message-Id: To: qemu-devel@nongnu.org Cc: blauwirbel@gmail.com, Jan Kiszka Ignore accesses to VAPIC when kvmvapic is not enabled. Cc: Jan Kiszka Signed-off-by: Blue Swirl --- hw/kvmvapic.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/kvmvapic.c b/hw/kvmvapic.c index dc111ee..a97d532 100644 --- a/hw/kvmvapic.c +++ b/hw/kvmvapic.c @@ -612,6 +612,9 @@ static void vapic_write(void *opaque, hwaddr addr, uint64_t data, hwaddr rom_paddr; VAPICROMState *s = opaque; + if (!kvm_irqchip_in_kernel()) { + return; + } cpu_synchronize_state(env); /* @@ -665,9 +668,7 @@ static void vapic_write(void *opaque, hwaddr addr, uint64_t data, break; default: case 4: - if (!kvm_irqchip_in_kernel()) { - apic_poll_irq(env->apic_state); - } + apic_poll_irq(env->apic_state); break; } }