From 1c0185141ccdbe1938474b0a5ec593d5a703d3bf Mon Sep 17 00:00:00 2001
From: Chris Lalancette <clalance@redhat.com>
Date: Fri, 20 Jun 2008 09:51:30 +0200
Subject: [PATCH] --- yaml --- r: 103743 b: refs/heads/master c:
 efa67e0d1f51842393606034051d805ab9948abd h: refs/heads/master i:   103741:
 8d868d23113b73b5e3b3c18571d67118f22df57d   103739:
 985a00114e68ac000e3c0613d72f83c56997adfe   103735:
 d6b5ce4515b52f81fd7bdb2e4c8d544c726ced61   103727:
 5647cad8781eb1c5d033bf4d05dbaab16e466270   103711:
 ee32b20e12a3c8e2134128683ab0d32687459b04   103679:
 14df2e4bc8faf7cd07a23fffa3e5d193aa70b7cf v: v3

---
 [refs]                   |  2 +-
 trunk/arch/x86/kvm/vmx.c | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 342c6a727894..6414da2276ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65267ea1b3e768dc54b63cd7fad520d89c27d350
+refs/heads/master: efa67e0d1f51842393606034051d805ab9948abd
diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c
index 6a3a4038f3b9..d493a97e7887 100644
--- a/trunk/arch/x86/kvm/vmx.c
+++ b/trunk/arch/x86/kvm/vmx.c
@@ -920,6 +920,18 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data)
 		break;
 	case MSR_IA32_TIME_STAMP_COUNTER:
 		guest_write_tsc(data);
+		break;
+	case MSR_P6_PERFCTR0:
+	case MSR_P6_PERFCTR1:
+	case MSR_P6_EVNTSEL0:
+	case MSR_P6_EVNTSEL1:
+		/*
+		 * Just discard all writes to the performance counters; this
+		 * should keep both older linux and windows 64-bit guests
+		 * happy
+		 */
+		pr_unimpl(vcpu, "unimplemented perfctr wrmsr: 0x%x data 0x%llx\n", msr_index, data);
+
 		break;
 	default:
 		vmx_load_host_state(vmx);