Skip to contentSkip to conversation

Fix tpr patching to get cpu index from Windows per cpu area.

PATCH Applied Gleb Natapov 2 participants 2 messages Jun 2, 2009 KVM

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix tpr patching to get cpu index from Windows per cpu area.

Using cpu_index for this purpose work only by luck.

kvm-tpr-opt.c +19 -3
index 246e08d..bdbc742 100644
@@ -220,13 +220,29 @@ static int bios_is_mapped(CPUState *env, uint64_t rip)
     return 1;
 }
 
+static int get_pcr_cpu(CPUState *env)
+{
+    struct kvm_sregs sregs;
+    uint8_t b;
+
+    kvm_save_registers(env);
+
+    if (cpu_memory_rw_debug(env, env->segs[R_FS].base + 0x51, &b, 1, 0) < 0)
+	    return -1;
+
+    return (int)b;
+}
+
 static int enable_vapic(CPUState *env)
 {
     static uint8_t one = 1;
+    int pcr_cpu = get_pcr_cpu(env);
+
+    if (pcr_cpu < 0)
+	    return 0;
 
-    kvm_enable_vapic(kvm_context, env->cpu_index,
-		     vapic_phys + (env->cpu_index << 7));
-    cpu_physical_memory_rw(vapic_phys + (env->cpu_index << 7) + 4, &one, 1, 1);
+    kvm_enable_vapic(kvm_context, env->cpu_index, vapic_phys + (pcr_cpu << 7));
+    cpu_physical_memory_rw(vapic_phys + (pcr_cpu << 7) + 4, &one, 1, 1);
     bios_enabled = 1;
 
     return 1;

--
Gleb.

Applied
#1 lore raw
Quoted 3 lines · Gleb Natapov

Using cpu_index for this purpose work only by luck.

Applied, thanks.

Signature · 1 line
error compiling committee.c: too many arguments to function