diff options
author | Michael Riepe <michael@mr511.de> | 2006-12-22 04:05:53 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-22 11:55:46 -0500 |
commit | 0f8e3d365a30a8788d4c348e2885bac9640bf4d0 (patch) | |
tree | 2ad622927aecff10190154c19cbc841d33231123 | |
parent | abacf8dff911ecc11513dff162d7990aa8ed2da0 (diff) |
[PATCH] KVM: Handle p5 mce msrs
This allows plan9 to get a little further booting.
Signed-off-by: Michael Riepe <michael@mr511.de>
Signed-off-by: Avi Kivity <avi@qumranet.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/kvm/svm.c | 2 | ||||
-rw-r--r-- | drivers/kvm/vmx.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/kvm/svm.c b/drivers/kvm/svm.c index 59c930f276e2..9ec87636ded6 100644 --- a/drivers/kvm/svm.c +++ b/drivers/kvm/svm.c | |||
@@ -1073,6 +1073,8 @@ static int emulate_on_interception(struct kvm_vcpu *vcpu, struct kvm_run *kvm_ru | |||
1073 | static int svm_get_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 *data) | 1073 | static int svm_get_msr(struct kvm_vcpu *vcpu, unsigned ecx, u64 *data) |
1074 | { | 1074 | { |
1075 | switch (ecx) { | 1075 | switch (ecx) { |
1076 | case MSR_IA32_P5_MC_ADDR: | ||
1077 | case MSR_IA32_P5_MC_TYPE: | ||
1076 | case MSR_IA32_MC0_CTL: | 1078 | case MSR_IA32_MC0_CTL: |
1077 | case MSR_IA32_MCG_STATUS: | 1079 | case MSR_IA32_MCG_STATUS: |
1078 | case MSR_IA32_MCG_CAP: | 1080 | case MSR_IA32_MCG_CAP: |
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c index 2d7c6d6f1273..983a15b1977c 100644 --- a/drivers/kvm/vmx.c +++ b/drivers/kvm/vmx.c | |||
@@ -359,6 +359,8 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata) | |||
359 | case MSR_IA32_SYSENTER_ESP: | 359 | case MSR_IA32_SYSENTER_ESP: |
360 | data = vmcs_read32(GUEST_SYSENTER_ESP); | 360 | data = vmcs_read32(GUEST_SYSENTER_ESP); |
361 | break; | 361 | break; |
362 | case MSR_IA32_P5_MC_ADDR: | ||
363 | case MSR_IA32_P5_MC_TYPE: | ||
362 | case MSR_IA32_MC0_CTL: | 364 | case MSR_IA32_MC0_CTL: |
363 | case MSR_IA32_MCG_STATUS: | 365 | case MSR_IA32_MCG_STATUS: |
364 | case MSR_IA32_MCG_CAP: | 366 | case MSR_IA32_MCG_CAP: |