Commit 72636420 authored Aug 21, 2012 by Avi Kivity Committed by Marcelo Tosatti Aug 27, 2012

KVM: VMX: Return real real-mode segment data even if emulate_invalid_guest_state=1

emulate_invalid_guest_state=1 doesn't mean we don't munge the segments in the
vmcs; we do. So we need to return the real ones (maintained by vmx_set_segment).

Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

parent 0afbe2f8

arch/x86/kvm/vmx.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -3108,8 +3108,7 @@ static void vmx_get_segment(struct kvm_vcpu *vcpu,
		if (vmx->rmode.vm86_active
		&& (seg == VCPU_SREG_TR \|\| seg == VCPU_SREG_ES
		\|\| seg == VCPU_SREG_DS \|\| seg == VCPU_SREG_FS
		\|\| seg == VCPU_SREG_GS)
		&& !emulate_invalid_guest_state) {
		\|\| seg == VCPU_SREG_GS)) {
		*var = vmx->rmode.segs[seg];
		if (seg == VCPU_SREG_TR
		\|\| var->selector == vmx_read_guest_seg_selector(vmx, seg))

Admin message