From mboxrd@z Thu Jan  1 00:00:00 1970
From: Gleb Natapov <gleb@redhat.com>
Subject: [PATCH] Fix tpr patching to get cpu index from Windows per cpu
	area.
Date: Tue, 2 Jun 2009 14:52:40 +0300
Message-ID: <20090602115240.GB25846@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: kvm@vger.kernel.org
To: avi@redhat.com
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx2.redhat.com ([66.187.237.31]:60116 "EHLO mx2.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1760064AbZFBLwl (ORCPT <rfc822;kvm@vger.kernel.org>);
	Tue, 2 Jun 2009 07:52:41 -0400
Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26])
	by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n52BqhHC022128
	for <kvm@vger.kernel.org>; Tue, 2 Jun 2009 07:52:43 -0400
Content-Disposition: inline
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>

Using cpu_index for this purpose work only by luck.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
diff --git a/kvm-tpr-opt.c b/kvm-tpr-opt.c
index 246e08d..bdbc742 100644
--- a/kvm-tpr-opt.c
+++ b/kvm-tpr-opt.c
@@ -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.