From 830b0041487cf244f0ec2052e1fd3d4c2fe6c7d5 Mon Sep 17 00:00:00 2001
From: Alexander Graf <alex@csgraf.de>
Date: Thu, 21 Feb 2008 12:11:01 +0100
Subject: [PATCH] --- yaml --- r: 93811 b: refs/heads/master c:
 847f0ad8cbfa70c1af6948025836dfbd9ed6da1e h: refs/heads/master i:   93809:
 f1e2b5b6ea30f5ea6f1bdeb733b166855d92bb70   93807:
 09d9b95f579888cba06da8e46afef49cdacdae0e v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/x86.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a2ccacced1ac..85a1f9593b63 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 14af3f3c56103d8c3bb173c255ef5d89fb0c9350
+refs/heads/master: 847f0ad8cbfa70c1af6948025836dfbd9ed6da1e
diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
index cf6261e3d928..0dd038e7392b 100644
--- a/trunk/arch/x86/kvm/x86.c
+++ b/trunk/arch/x86/kvm/x86.c
@@ -426,6 +426,7 @@ static u32 msrs_to_save[] = {
 	MSR_CSTAR, MSR_KERNEL_GS_BASE, MSR_SYSCALL_MASK, MSR_LSTAR,
 #endif
 	MSR_IA32_TIME_STAMP_COUNTER, MSR_KVM_SYSTEM_TIME, MSR_KVM_WALL_CLOCK,
+	MSR_IA32_PERF_STATUS,
 };
 
 static unsigned num_msrs_to_save;
@@ -653,7 +654,6 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata)
 	case MSR_IA32_MC0_MISC+12:
 	case MSR_IA32_MC0_MISC+16:
 	case MSR_IA32_UCODE_REV:
-	case MSR_IA32_PERF_STATUS:
 	case MSR_IA32_EBL_CR_POWERON:
 		/* MTRR registers */
 	case 0xfe:
@@ -669,6 +669,12 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata)
 	case MSR_IA32_MISC_ENABLE:
 		data = vcpu->arch.ia32_misc_enable_msr;
 		break;
+	case MSR_IA32_PERF_STATUS:
+		/* TSC increment by tick */
+		data = 1000ULL;
+		/* CPU multiplier */
+		data |= (((uint64_t)4ULL) << 40);
+		break;
 	case MSR_EFER:
 		data = vcpu->arch.shadow_efer;
 		break;