diff options
| author | Avi Kivity <avi@qumranet.com> | 2007-03-21 16:58:32 +0100 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2007-05-03 09:52:26 +0200 |
| commit | 038881c8bec0e9a796d1782c56e29e7c2456626d (patch) | |
| tree | 8ca64ffb2f06cb29fa3fda3b9987defc2ece18a4 | |
| parent | KVM: Modify guest segments after potentially switching modes (diff) | |
| download | linux-038881c8bec0e9a796d1782c56e29e7c2456626d.tar.xz linux-038881c8bec0e9a796d1782c56e29e7c2456626d.zip | |
KVM: Hack real-mode segments on vmx from KVM_SET_SREGS
As usual, we need to mangle segment registers when emulating real mode
as vm86 has specific constraints. We special case the reset segment base,
and set the "access rights" (or descriptor flags) to vm86 comaptible values.
This fixes reboot on vmx.
Signed-off-by: Avi Kivity <avi@qumranet.com>
| -rw-r--r-- | drivers/kvm/vmx.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c index 027a9625ef90..578dff5424e3 100644 --- a/drivers/kvm/vmx.c +++ b/drivers/kvm/vmx.c @@ -864,7 +864,14 @@ static void vmx_set_segment(struct kvm_vcpu *vcpu, vmcs_writel(sf->base, var->base); vmcs_write32(sf->limit, var->limit); vmcs_write16(sf->selector, var->selector); - if (var->unusable) + if (vcpu->rmode.active && var->s) { + /* + * Hack real-mode segments into vm86 compatibility. + */ + if (var->base == 0xffff0000 && var->selector == 0xf000) + vmcs_writel(sf->base, 0xf0000); + ar = 0xf3; + } else if (var->unusable) ar = 1 << 16; else { ar = var->type & 15; |