[patch 1/4] QEMU/KVM: only use KVM apic registers if vm is running

[Marcelo Tosatti <mtosatti@redhat.com>]

[-- Attachment #1: fix-migration-1 --]
[-- Type: text/plain, Size: 1206 bytes --]

In the -incoming case the apic regs are not initialized and therefore
bogus.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

Index: kvm-userspace.io/qemu/qemu-kvm-x86.c
===================================================================
--- kvm-userspace.io.orig/qemu/qemu-kvm-x86.c
+++ kvm-userspace.io/qemu/qemu-kvm-x86.c
@@ -27,6 +27,8 @@ static int kvm_has_msr_star;
 
 static int lm_capable_kernel;
 
+extern int vm_running;
+
 int kvm_arch_qemu_create_context(void)
 {
     int i;
@@ -248,7 +250,7 @@ void kvm_arch_load_regs(CPUState *env)
     sregs.cr3 = env->cr[3];
     sregs.cr4 = env->cr[4];
 
-    if (kvm_irqchip_in_kernel(kvm_context)) {
+    if (kvm_irqchip_in_kernel(kvm_context) && vm_running) {
         sregs.cr8 = kvm_get_cr8(kvm_context, env->cpu_index);
         sregs.apic_base = kvm_get_apic_base(kvm_context, env->cpu_index);
     } else {

-- 


-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Register now and save $200. Hurry, offer ends at 11:59 p.m., 
Monday, April 7! Use priority code J8TLD2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone