From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52530) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Whuvu-00035I-Ak for qemu-devel@nongnu.org; Wed, 07 May 2014 02:02:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Whuvi-0002GO-WC for qemu-devel@nongnu.org; Wed, 07 May 2014 02:02:22 -0400 Received: from e23smtp09.au.ibm.com ([202.81.31.142]:39863) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Whuvi-0002FD-4q for qemu-devel@nongnu.org; Wed, 07 May 2014 02:02:10 -0400 Received: from /spool/local by e23smtp09.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 7 May 2014 16:02:05 +1000 From: Alexey Kardashevskiy Date: Wed, 7 May 2014 16:01:54 +1000 Message-Id: <1399442518-26303-3-git-send-email-aik@ozlabs.ru> In-Reply-To: <1399442518-26303-1-git-send-email-aik@ozlabs.ru> References: <1399442518-26303-1-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [PATCH 2/6] xics: add find_server List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexey Kardashevskiy , qemu-ppc@nongnu.org, Alexander Graf PAPR allows having multiple interrupr servers. This adds a server lookup function and makes use of it. Since at the moment QEMU only supports a single server, no change in behaviour is expected. Signed-off-by: Alexey Kardashevskiy --- hw/intc/xics.c | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 1f89a00..9314654 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -635,14 +635,30 @@ static const TypeInfo ics_info = { /* * Exported functions */ +static int xics_find_server(XICSState *icp, int irq) +{ + int server; + + for (server = 0; server < icp->nr_servers; ++server) { + ICSState *ics = &icp->ics[server]; + if (ics_valid_irq(ics, irq)) { + return server; + } + } + + return -1; +} qemu_irq xics_get_qirq(XICSState *icp, int irq) { - if (!ics_valid_irq(icp->ics, irq)) { - return NULL; + int server = xics_find_server(icp, irq); + + if (server >= 0) { + ICSState *ics = &icp->ics[server]; + return ics->qirqs[irq - ics->offset]; } - return icp->ics->qirqs[irq - icp->ics->offset]; + return NULL; } static void ics_set_irq_type(ICSState *ics, int srcno, bool lsi) @@ -653,10 +669,12 @@ static void ics_set_irq_type(ICSState *ics, int srcno, bool lsi) void xics_set_irq_type(XICSState *icp, int irq, bool lsi) { - ICSState *ics = icp->ics; + int server = xics_find_server(icp, irq); + ICSState *ics; - assert(ics_valid_irq(ics, irq)); + assert(server >= 0); + ics = &icp->ics[server]; ics_set_irq_type(ics, irq - ics->offset, lsi); } -- 1.8.4.rc4