Commit 31ff6488 authored Nov 19, 2014 by Nadav Amit Committed by Paolo Bonzini Nov 19, 2014

KVM: x86: Move __linearize masking of la into switch



In __linearize there is check of the condition whether to check if masking of
the linear address is needed.  It occurs immediately after switch that
evaluates the same condition.  Merge them.

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

parent abc7d8a4

arch/x86/kvm/emulate.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -670,10 +670,9 @@ static __always_inline int __linearize(struct x86_emulate_ctxt *ctxt,
		}
		if (size > *max_size)
		goto bad;
		la &= (u32)-1;
		break;
		}
		if (ctxt->mode != X86EMUL_MODE_PROT64)
		la &= (u32)-1;
		if (insn_aligned(ctxt, size) && ((la & (size - 1)) != 0))
		return emulate_gp(ctxt, 0);
		*linear = la;