From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KkNwb-000535-E2
	for qemu-devel@nongnu.org; Mon, 29 Sep 2008 14:58:05 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KkNwZ-00052L-5C
	for qemu-devel@nongnu.org; Mon, 29 Sep 2008 14:58:04 -0400
Received: from [199.232.76.173] (port=60664 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KkNwY-00052I-Ql
	for qemu-devel@nongnu.org; Mon, 29 Sep 2008 14:58:02 -0400
Received: from kassel160.server4you.de ([62.75.246.160]:44064 helo=csgraf.de)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60)
	(envelope-from <alex@csgraf.de>) id 1KkNwY-0008OK-HN
	for qemu-devel@nongnu.org; Mon, 29 Sep 2008 14:58:02 -0400
Message-ID: <48E12536.8040306@csgraf.de>
Date: Mon, 29 Sep 2008 20:57:58 +0200
From: Alexander Graf <alex@csgraf.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="------------090109000206000802020902"
Subject: [Qemu-devel] [PATCH] Fix messed up MSR_IA32_PERF_STATUS
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: paul@codesourcery.com

This is a multi-part message in MIME format.
--------------090109000206000802020902
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Fix messed up MSR_IA32_PERF_STATUS

During a merge (probably on my side) the MSR_IA32_PERF_STATUS entry got 
lost in the wrmsr handler. The code is obviously rdmsr though, so let's 
shove it back to where it belongs.

Signed-off-by: Alexander Graf <agraf@suse.de>



--------------090109000206000802020902
Content-Type: text/x-patch;
 name="perf_status.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="perf_status.patch"

Index: target-i386/op_helper.c
===================================================================
--- target-i386/op_helper.c	(revision 5357)
+++ target-i386/op_helper.c	(working copy)
@@ -3175,12 +3175,6 @@
     case MSR_VM_HSAVE_PA:
         env->vm_hsave = val;
         break;
-    case MSR_IA32_PERF_STATUS:
-        /* tsc_increment_by_tick */ 
-        val = 1000ULL;
-        /* CPU multiplier */
-        val |= (((uint64_t)4ULL) << 40);
-        break;
 #ifdef TARGET_X86_64
     case MSR_LSTAR:
         env->lstar = val;
@@ -3238,6 +3232,12 @@
     case MSR_VM_HSAVE_PA:
         val = env->vm_hsave;
         break;
+    case MSR_IA32_PERF_STATUS:
+        /* tsc_increment_by_tick */ 
+        val = 1000ULL;
+        /* CPU multiplier */
+        val |= (((uint64_t)4ULL) << 40);
+        break;
 #ifdef TARGET_X86_64
     case MSR_LSTAR:
         val = env->lstar;

--------------090109000206000802020902--