[Qemu-devel] [PATCH] Fix messed up MSR_IA32_PERF_STATUS

[Alexander Graf <alex@csgraf.de>]

[-- Attachment #1: Type: text/plain, Size: 266 bytes --]

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>



[-- Attachment #2: perf_status.patch --]
[-- Type: text/x-patch, Size: 882 bytes --]

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;