From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52508) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Whuvt-00034S-FT for qemu-devel@nongnu.org; Wed, 07 May 2014 02:02:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Whuvj-0002HT-Lj for qemu-devel@nongnu.org; Wed, 07 May 2014 02:02:21 -0400 Received: from e23smtp02.au.ibm.com ([202.81.31.144]:57835) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Whuvi-0002Fj-SK for qemu-devel@nongnu.org; Wed, 07 May 2014 02:02:11 -0400 Received: from /spool/local by e23smtp02.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 7 May 2014 16:02:07 +1000 From: Alexey Kardashevskiy Date: Wed, 7 May 2014 16:01:57 +1000 Message-Id: <1399442518-26303-6-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 5/6] spapr: remove @next_irq 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 This removes @next_irq from sPAPREnvironment which was used in old IRQ allocator as XICS is now responsible for IRQs and keeps track of allocated IRQs. Signed-off-by: Alexey Kardashevskiy --- hw/ppc/spapr.c | 3 +-- include/hw/ppc/spapr.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index db21515..a680e90 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -754,7 +754,7 @@ static const VMStateDescription vmstate_spapr = { .minimum_version_id = 1, .minimum_version_id_old = 1, .fields = (VMStateField []) { - VMSTATE_UINT32(next_irq, sPAPREnvironment), + VMSTATE_UNUSED(4), /* used to be @next_irq */ /* RTC offset */ VMSTATE_UINT64(rtc_offset, sPAPREnvironment), @@ -1158,7 +1158,6 @@ static void ppc_spapr_init(QEMUMachineInitArgs *args) /* Set up Interrupt Controller before we create the VCPUs */ spapr->icp = xics_system_init(smp_cpus * kvmppc_smt_threads() / smp_threads, XICS_IRQS); - spapr->next_irq = XICS_IRQ_BASE; /* init CPUs */ if (cpu_model == NULL) { diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index feb241a..f8d7326 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -27,7 +27,6 @@ typedef struct sPAPREnvironment { long rtas_size; void *fdt_skel; target_ulong entry_point; - uint32_t next_irq; uint64_t rtc_offset; bool has_graphics; -- 1.8.4.rc4