From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51944) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOJZr-00073M-Ji for qemu-devel@nongnu.org; Fri, 14 Mar 2014 00:18:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WOJZf-0004Uy-OT for qemu-devel@nongnu.org; Fri, 14 Mar 2014 00:18:35 -0400 Received: from e23smtp08.au.ibm.com ([202.81.31.141]:58359) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOJZe-0004OI-Tv for qemu-devel@nongnu.org; Fri, 14 Mar 2014 00:18:23 -0400 Received: from /spool/local by e23smtp08.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 14 Mar 2014 14:18:18 +1000 From: Alexey Kardashevskiy Date: Fri, 14 Mar 2014 15:18:08 +1100 Message-Id: <1394770689-29039-8-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 7/8] 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 , =?UTF-8?q?Andreas=20F=C3=A4rber?= This removes @next_irq from sPAPREnvironment which was used in old IRQ allocator as XICS is now responsible for IRQs and keep track of allocated IRQs. Signed-off-by: Alexey Kardashevskiy --- hw/ppc/spapr.c | 3 --- include/hw/ppc/spapr.h | 1 - 2 files changed, 4 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 29ca2e0..1f7162c 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -732,8 +732,6 @@ static const VMStateDescription vmstate_spapr = { .minimum_version_id = 1, .minimum_version_id_old = 1, .fields = (VMStateField []) { - VMSTATE_UINT32(next_irq, sPAPREnvironment), - /* RTC offset */ VMSTATE_UINT64(rtc_offset, sPAPREnvironment), @@ -1136,7 +1134,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 5d577ff..aac2505 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -28,7 +28,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