From patchwork Tue Oct 30 03:25:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 195270 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 204142C00A8 for ; Tue, 30 Oct 2012 14:24:32 +1100 (EST) Received: from localhost ([::1]:50984 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TT2RJ-0008RS-V7 for incoming@patchwork.ozlabs.org; Mon, 29 Oct 2012 23:24:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40176) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TT2Qw-0008II-JV for qemu-devel@nongnu.org; Mon, 29 Oct 2012 23:24:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TT2Qs-0001Kj-V3 for qemu-devel@nongnu.org; Mon, 29 Oct 2012 23:24:06 -0400 Received: from ozlabs.org ([203.10.76.45]:45528) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TT2Qs-0001Id-KC; Mon, 29 Oct 2012 23:24:02 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id BB38D2C00A7; Tue, 30 Oct 2012 14:23:57 +1100 (EST) From: David Gibson To: agraf@suse.de Date: Tue, 30 Oct 2012 14:25:00 +1100 Message-Id: <1351567512-17278-5-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1351567512-17278-1-git-send-email-david@gibson.dropbear.id.au> References: <1351567512-17278-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 203.10.76.45 Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson Subject: [Qemu-devel] [PATCH 04/16] pseries: Clean up inconsistent variable name in xics.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- hw/xics.c | 6 +++--- 1 file 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); } }