Commit d5e49a8199f4dcc74e54b1633f48ed1a19fd9db8
1 parent
2e9b08e5
Handle MSR_IA32_PERF_STATUS in rdmsr (Alexander Graf).
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5366 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
6 additions
and
6 deletions
target-i386/op_helper.c
| @@ -3175,12 +3175,6 @@ void helper_wrmsr(void) | @@ -3175,12 +3175,6 @@ void helper_wrmsr(void) | ||
| 3175 | case MSR_VM_HSAVE_PA: | 3175 | case MSR_VM_HSAVE_PA: |
| 3176 | env->vm_hsave = val; | 3176 | env->vm_hsave = val; |
| 3177 | break; | 3177 | break; |
| 3178 | - case MSR_IA32_PERF_STATUS: | ||
| 3179 | - /* tsc_increment_by_tick */ | ||
| 3180 | - val = 1000ULL; | ||
| 3181 | - /* CPU multiplier */ | ||
| 3182 | - val |= (((uint64_t)4ULL) << 40); | ||
| 3183 | - break; | ||
| 3184 | #ifdef TARGET_X86_64 | 3178 | #ifdef TARGET_X86_64 |
| 3185 | case MSR_LSTAR: | 3179 | case MSR_LSTAR: |
| 3186 | env->lstar = val; | 3180 | env->lstar = val; |
| @@ -3238,6 +3232,12 @@ void helper_rdmsr(void) | @@ -3238,6 +3232,12 @@ void helper_rdmsr(void) | ||
| 3238 | case MSR_VM_HSAVE_PA: | 3232 | case MSR_VM_HSAVE_PA: |
| 3239 | val = env->vm_hsave; | 3233 | val = env->vm_hsave; |
| 3240 | break; | 3234 | break; |
| 3235 | + case MSR_IA32_PERF_STATUS: | ||
| 3236 | + /* tsc_increment_by_tick */ | ||
| 3237 | + val = 1000ULL; | ||
| 3238 | + /* CPU multiplier */ | ||
| 3239 | + val |= (((uint64_t)4ULL) << 40); | ||
| 3240 | + break; | ||
| 3241 | #ifdef TARGET_X86_64 | 3241 | #ifdef TARGET_X86_64 |
| 3242 | case MSR_LSTAR: | 3242 | case MSR_LSTAR: |
| 3243 | val = env->lstar; | 3243 | val = env->lstar; |