Commit 7d882ffa authored Nov 19, 2014 by Nadav Amit Committed by Paolo Bonzini Nov 19, 2014

KVM: x86: Revert NoBigReal patch in the emulator

Commit 10e38fc7cab6 ("KVM: x86: Emulator flag for instruction that only support
16-bit addresses in real mode") introduced NoBigReal for instructions such as
MONITOR. Apparetnly, the Intel SDM description that led to this patch is
misleading. Since no instruction is using NoBigReal, it is safe to remove it,
we fully understand what the SDM means.

Signed-off-by: Nadav Amit <namit@cs.technion.ac.il>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 842bb26a

arch/x86/kvm/emulate.c

+1 −7

Original line number	Diff line number	Diff line
		@@ -690,13 +690,7 @@ static __always_inline int __linearize(struct x86_emulate_ctxt *ctxt,
		if (!fetch && (desc.type & 8) && !(desc.type & 2))
		goto bad;
		lim = desc_limit_scaled(&desc);
		if ((ctxt->mode == X86EMUL_MODE_REAL) && !fetch &&
		(ctxt->d & NoBigReal)) {
		/* la is between zero and 0xffff */
		if (la > 0xffff)
		goto bad;
		*max_size = 0x10000 - la;
		} else if ((desc.type & 8) \|\| !(desc.type & 4)) {
		if ((desc.type & 8) \|\| !(desc.type & 4)) {
		/* expand-up segment */
		if (addr.ea > lim)
		goto bad;

Admin message