From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paolo Bonzini Subject: Re: [PATCH 4/4] x86/kvm: Resolve shadow warning from min macro Date: Fri, 25 Jul 2014 16:06:06 +0200 Message-ID: <53D2644E.3080202@redhat.com> References: <1406294825-21393-1-git-send-email-jeffrey.t.kirsher@intel.com> <1406294825-21393-4-git-send-email-jeffrey.t.kirsher@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Cc: Mark Rustad , kvm@vger.kernel.org To: Jeff Kirsher , gleb@kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:57224 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760508AbaGYOGN (ORCPT ); Fri, 25 Jul 2014 10:06:13 -0400 In-Reply-To: <1406294825-21393-4-git-send-email-jeffrey.t.kirsher@intel.com> Sender: kvm-owner@vger.kernel.org List-ID: Il 25/07/2014 15:27, Jeff Kirsher ha scritto: > From: Mark Rustad > > 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 > Signed-off-by: Jeff Kirsher > --- > arch/x86/kvm/emulate.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c > index e4e833d..2d6c97a 100644 > --- a/arch/x86/kvm/emulate.c > +++ b/arch/x86/kvm/emulate.c > @@ -1315,8 +1315,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; > Applied. Paolo