---

yaml --- r: 44871 b: refs/heads/master c: 0f8e3d3 h: refs/heads/master i: 44869: ff6321f 44867: 9b6eb72 44863: 19cb1ea v: v3
git-mirror · Dec 22, 2006 · cacdee1 · cacdee1
1 parent 8e36dbc
commit cacdee1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: abacf8dff911ecc11513dff162d7990aa8ed2da0
+refs/heads/master: 0f8e3d365a30a8788d4c348e2885bac9640bf4d0
diff --git a/trunk/drivers/kvm/svm.c b/trunk/drivers/kvm/svm.c
@@ -1073,6 +1073,8 @@ static int emulate_on_interception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_ru
 static int svm_get_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 *data)
 {
 	switch (ecx) {
+	case MSR_IA32_P5_MC_ADDR:
+	case MSR_IA32_P5_MC_TYPE:
 	case MSR_IA32_MC0_CTL:
 	case MSR_IA32_MCG_STATUS:
 	case MSR_IA32_MCG_CAP:

diff --git a/trunk/drivers/kvm/vmx.c b/trunk/drivers/kvm/vmx.c
@@ -359,6 +359,8 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata)
 	case MSR_IA32_SYSENTER_ESP:
 		data = vmcs_read32(GUEST_SYSENTER_ESP);
 		break;
+	case MSR_IA32_P5_MC_ADDR:
+	case MSR_IA32_P5_MC_TYPE:
 	case MSR_IA32_MC0_CTL:
 	case MSR_IA32_MCG_STATUS:
 	case MSR_IA32_MCG_CAP: