From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51848) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOJZp-00073F-EA for qemu-devel@nongnu.org; Fri, 14 Mar 2014 00:18:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WOJZf-0004Sd-6T for qemu-devel@nongnu.org; Fri, 14 Mar 2014 00:18:33 -0400 Received: from e23smtp09.au.ibm.com ([202.81.31.142]:41645) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOJZe-0004J1-Eq for qemu-devel@nongnu.org; Fri, 14 Mar 2014 00:18:23 -0400 Received: from /spool/local by e23smtp09.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 14 Mar 2014 14:18:16 +1000 From: Alexey Kardashevskiy Date: Fri, 14 Mar 2014 15:18:04 +1100 Message-Id: <1394770689-29039-4-git-send-email-aik@ozlabs.ru> In-Reply-To: <1394770689-29039-1-git-send-email-aik@ozlabs.ru> References: <1394770689-29039-1-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [PATCH 3/8] 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 , =?UTF-8?q?Andreas=20F=C3=A4rber?= PAPR allows having multiple interrupr servers. However now we only support one. This adds a server lookup function and makes use of it. At the moment no change is expected. Signed-off-by: Alexey Kardashevskiy --- hw/intc/xics.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 7eac85a..88ef9ef 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 irq, bool lsi) @@ -653,9 +669,10 @@ static void ics_set_irq_type(ICSState *ics, int irq, bool lsi) void xics_set_irq_type(XICSState *icp, int irq, bool lsi) { - assert(ics_valid_irq(icp->ics, irq)); + int server = xics_find_server(icp, irq); - ics_set_irq_type(icp->ics, irq, lsi); + assert(server >= 0); + ics_set_irq_type(&icp->ics[server], irq, lsi); } /* -- 1.8.4.rc4