---

yaml --- r: 103743 b: refs/heads/master c: efa67e0 h: refs/heads/master i: 103741: 8d868d2 103739: 985a001 103735: d6b5ce4 103727: 5647cad 103711: ee32b20 103679: 14df2e4 v: v3
git-mirror · Jul 20, 2008 · 1c01851 · 1c01851
1 parent 6794d51
commit 1c01851
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git 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
@@ -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);