diff options
| author | Avi Kivity <avi@qumranet.com> | 2006-12-29 16:49:45 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-30 10:56:44 -0800 |
| commit | 671d6564796e0c90398aab30f89b5e48fc5a3fbe (patch) | |
| tree | 9e8b0712f44f8b86e48a876b9a6b8db3836e67c4 /drivers | |
| parent | 09db28b8a3765a7ec35eba80420c71a7973f5a88 (diff) | |
| download | linux-next-671d6564796e0c90398aab30f89b5e48fc5a3fbe.tar.gz | |
[PATCH] KVM: Implement a few system configuration msrs
Resolves sourceforge bug 1622229 (guest crashes running benchmark software).
Signed-off-by: Avi Kivity <avi@qumranet.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/kvm/svm.c | 3 | ||||
| -rw-r--r-- | drivers/kvm/vmx.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/kvm/svm.c b/drivers/kvm/svm.c index 68124c0bf630..6cd97c69ab3b 100644 --- a/drivers/kvm/svm.c +++ b/drivers/kvm/svm.c @@ -1068,6 +1068,9 @@ 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 0xc0010010: /* SYSCFG */ + case 0xc0010015: /* HWCR */ + case MSR_IA32_PLATFORM_ID: case MSR_IA32_P5_MC_ADDR: case MSR_IA32_P5_MC_TYPE: case MSR_IA32_MC0_CTL: diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c index 603a4135de42..e5358a8b01f1 100644 --- a/drivers/kvm/vmx.c +++ b/drivers/kvm/vmx.c @@ -359,6 +359,9 @@ 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 0xc0010010: /* SYSCFG */ + case 0xc0010015: /* HWCR */ + case MSR_IA32_PLATFORM_ID: case MSR_IA32_P5_MC_ADDR: case MSR_IA32_P5_MC_TYPE: case MSR_IA32_MC0_CTL: |