Skip to contentSkip to conversation

kvmvapic: fix migration

PATCH In review Pavel Dovgalyuk 2 participants 2 messages Sep 22, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kvmvapic: fix migration

This patch fixes migration by extending do_vapic_enable function. This function called vapic_enable which read cpu number from the guest memory. When cpu number could not be read, vapic was not enabled while loading the VM state. This patch adds required code for cpu_number=0 to do_vapic_enable function, because it is called only when cpu_number=0.

---
 hw/i386/kvmvapic.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
hw/i386/kvmvapic.c +5 -1
index 2cca7a4..f9da050 100644
@@ -732,7 +732,11 @@ static void do_vapic_enable(void *data)
     VAPICROMState *s = data;
     X86CPU *cpu = X86_CPU(first_cpu);
 
-    vapic_enable(s, cpu);
+    static const uint8_t enabled = 1;
+    cpu_physical_memory_write(s->vapic_paddr + offsetof(VAPICState, enabled),
+                              &enabled, sizeof(enabled));
+    apic_enable_vapic(cpu->apic_state, s->vapic_paddr);
+    s->state = VAPIC_ACTIVE;
 }
 
 static void kvmvapic_vm_state_change(void *opaque, int running,
#1 lore raw

Il 22/09/2014 14:14, Pavel Dovgalyuk ha scritto:

Quoted 19 lines

This patch fixes migration by extending do_vapic_enable function. This function called vapic_enable which read cpu number from the guest memory. When cpu number could not be read, vapic was not enabled while loading the VM state. This patch adds required code for cpu_number=0 to do_vapic_enable function, because it is called only when cpu_number=0.

---
 hw/i386/kvmvapic.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
hw/i386/kvmvapic.c +0 -0
index 2cca7a4..f9da050 100644
@@ -732,7 +732,11 @@ static void do_vapic_enable(void *data)
     VAPICROMState *s = data;
     X86CPU *cpu = X86_CPU(first_cpu);

hw/i386/kvmvapic.c static void do_vapic_enable(void *data) · line 742

Quoted 10 lines
hw/i386/kvmvapic.c +5 -1
 
-    vapic_enable(s, cpu);
+    static const uint8_t enabled = 1;
+    cpu_physical_memory_write(s->vapic_paddr + offsetof(VAPICState, enabled),
+                              &enabled, sizeof(enabled));
+    apic_enable_vapic(cpu->apic_state, s->vapic_paddr);
+    s->state = VAPIC_ACTIVE;
 }
 
 static void kvmvapic_vm_state_change(void *opaque, int running,

Thanks.

Paolo