diff options
| author | Avi Kivity <avi@qumranet.com> | 2007-03-06 12:05:53 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2007-03-18 10:49:06 +0200 |
| commit | f5b42c3324494ea3f9bf795e2a7e4d3cbb06c607 (patch) | |
| tree | 98019c1e0f8d6ac45386dea3f4d5eab356ea864c /drivers | |
| parent | ca45aaae1ef98890ac4e3ee48d65aa22401fd1dc (diff) | |
| download | linux-3.10-f5b42c3324494ea3f9bf795e2a7e4d3cbb06c607.tar.gz linux-3.10-f5b42c3324494ea3f9bf795e2a7e4d3cbb06c607.tar.bz2 linux-3.10-f5b42c3324494ea3f9bf795e2a7e4d3cbb06c607.zip | |
KVM: Fix guest sysenter on vmx
The vmx code currently treats the guest's sysenter support msrs as 32-bit
values, which breaks 32-bit compat mode userspace on 64-bit guests. Fix by
using the native word width of the machine.
Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/kvm/vmx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c index c07178e6112..bfa0ce42ea9 100644 --- a/drivers/kvm/vmx.c +++ b/drivers/kvm/vmx.c @@ -371,10 +371,10 @@ static int vmx_get_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata) data = vmcs_read32(GUEST_SYSENTER_CS); break; case MSR_IA32_SYSENTER_EIP: - data = vmcs_read32(GUEST_SYSENTER_EIP); + data = vmcs_readl(GUEST_SYSENTER_EIP); break; case MSR_IA32_SYSENTER_ESP: - data = vmcs_read32(GUEST_SYSENTER_ESP); + data = vmcs_readl(GUEST_SYSENTER_ESP); break; default: msr = find_msr_entry(vcpu, msr_index); @@ -412,10 +412,10 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data) vmcs_write32(GUEST_SYSENTER_CS, data); break; case MSR_IA32_SYSENTER_EIP: - vmcs_write32(GUEST_SYSENTER_EIP, data); + vmcs_writel(GUEST_SYSENTER_EIP, data); break; case MSR_IA32_SYSENTER_ESP: - vmcs_write32(GUEST_SYSENTER_ESP, data); + vmcs_writel(GUEST_SYSENTER_ESP, data); break; case MSR_IA32_TIME_STAMP_COUNTER: guest_write_tsc(data); |