From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:52083) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTtYY-0000sG-Q6 for qemu-devel@nongnu.org; Thu, 01 Nov 2012 08:07:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTtYS-0007SN-CQ for qemu-devel@nongnu.org; Thu, 01 Nov 2012 08:07:30 -0400 From: Alexander Graf Date: Thu, 1 Nov 2012 13:07:16 +0100 Message-Id: <1351771637-20685-5-git-send-email-agraf@suse.de> In-Reply-To: <1351771637-20685-1-git-send-email-agraf@suse.de> References: <1351771637-20685-1-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH 4/5] pseries: Clean up inconsistent variable name in xics.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel qemu-devel Cc: Blue Swirl , "qemu-ppc@nongnu.org List" , Aurelien Jarno , David Gibson From: David Gibson Throughout xics.c 'nr' is used to refer to a global interrupt number, and 'server' is used to refer to an interrupt server number (i.e. CPU number). Except in icp_set_mfrr(), where 'nr' is used as a server number. Fix this confusing inconsistency. Signed-off-by: David Gibson Signed-off-by: Alexander Graf --- hw/xics.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/xics.c b/hw/xics.c index ce88aa7..7a899dd 100644 --- a/hw/xics.c +++ b/hw/xics.c @@ -108,13 +108,13 @@ static void icp_set_cppr(struct icp_state *icp, int server, uint8_t cppr) } } -static void icp_set_mfrr(struct icp_state *icp, int nr, uint8_t mfrr) +static void icp_set_mfrr(struct icp_state *icp, int server, uint8_t mfrr) { - struct icp_server_state *ss = icp->ss + nr; + struct icp_server_state *ss = icp->ss + server; ss->mfrr = mfrr; if (mfrr < CPPR(ss)) { - icp_check_ipi(icp, nr); + icp_check_ipi(icp, server); } } -- 1.6.0.2