Commit b55a8144 authored Jul 25, 2014 by Mark Rustad Committed by Paolo Bonzini Jul 25, 2014

x86/kvm: Resolve shadow warning from min macro



Resolve a shadow warning generated in W=2 builds by the nested
use of the min macro by instead using the min3 macro for the
minimum of 3 values.

Signed-off-by: Mark Rustad <mark.d.rustad@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

parent 25f97ff4

arch/x86/kvm/emulate.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -1317,8 +1317,7 @@ static int pio_in_emulated(struct x86_emulate_ctxt *ctxt,
		in_page = (ctxt->eflags & EFLG_DF) ?
		offset_in_page(reg_read(ctxt, VCPU_REGS_RDI)) :
		PAGE_SIZE - offset_in_page(reg_read(ctxt, VCPU_REGS_RDI));
		n = min(min(in_page, (unsigned int)sizeof(rc->data)) / size,
		count);
		n = min3(in_page, (unsigned int)sizeof(rc->data) / size, count);
		if (n == 0)
		n = 1;
		rc->pos = rc->end = 0;

Admin message