From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53731) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Us5yo-0001Nu-2W for qemu-devel@nongnu.org; Thu, 27 Jun 2013 02:46:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Us5ym-00075a-Tx for qemu-devel@nongnu.org; Thu, 27 Jun 2013 02:46:54 -0400 Received: from mail-ie0-f179.google.com ([209.85.223.179]:45808) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Us5ym-00075T-PS for qemu-devel@nongnu.org; Thu, 27 Jun 2013 02:46:52 -0400 Received: by mail-ie0-f179.google.com with SMTP id c10so848374ieb.10 for ; Wed, 26 Jun 2013 23:46:52 -0700 (PDT) From: Alexey Kardashevskiy Date: Thu, 27 Jun 2013 16:45:48 +1000 Message-Id: <1372315560-5478-6-git-send-email-aik@ozlabs.ru> In-Reply-To: <1372315560-5478-1-git-send-email-aik@ozlabs.ru> References: <1372315560-5478-1-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [PATCH 05/17] pseries: savevm support for XICS interrupt controller List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori , aik@ozlabs.ru, Alexander Graf , qemu-ppc@nongnu.org, Paolo Bonzini , Paul Mackerras , David Gibson From: David Gibson This patch adds the necessary VMStateDescription information to support savevm/loadvm for the XICS interrupt controller used on the pseries machine. Signed-off-by: David Gibson [aik: added ics_resend() on post_load] Signed-off-by: Alexey Kardashevskiy --- hw/intc/xics.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/hw/intc/xics.c b/hw/intc/xics.c index 0e374c8..3e8f48f 100644 --- a/hw/intc/xics.c +++ b/hw/intc/xics.c @@ -497,6 +497,61 @@ static void xics_reset(DeviceState *d) xics_common_reset(XICS(d)); } +static int ics_post_load(void *opaque, int version_id) +{ + int i; + struct ics_state *ics = opaque; + + for (i = 0; i < ics->icp->nr_servers; i++) { + icp_resend(ics->icp, i); + } + + return 0; +} + +const VMStateDescription vmstate_icp_server = { + .name = "icp/server", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 1, + .fields = (VMStateField []) { + /* Sanity check */ + VMSTATE_UINT32(xirr, struct icp_server_state), + VMSTATE_UINT8(pending_priority, struct icp_server_state), + VMSTATE_UINT8(mfrr, struct icp_server_state), + VMSTATE_END_OF_LIST() + }, +}; + +static const VMStateDescription vmstate_ics_irq = { + .name = "ics/irq", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 1, + .fields = (VMStateField []) { + VMSTATE_UINT32(server, struct ics_irq_state), + VMSTATE_UINT8(priority, struct ics_irq_state), + VMSTATE_UINT8(saved_priority, struct ics_irq_state), + VMSTATE_UINT8(status, struct ics_irq_state), + VMSTATE_END_OF_LIST() + }, +}; + +const VMStateDescription vmstate_ics = { + .name = "ics", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 1, + .post_load = ics_post_load, + .fields = (VMStateField []) { + /* Sanity check */ + VMSTATE_UINT32_EQUAL(nr_irqs, struct ics_state), + + VMSTATE_STRUCT_VARRAY_POINTER_UINT32(irqs, struct ics_state, nr_irqs, vmstate_ics_irq, struct ics_irq_state), + VMSTATE_END_OF_LIST() + }, +}; + void xics_common_cpu_setup(struct icp_state *icp, PowerPCCPU *cpu) { CPUState *cs = CPU(cpu); @@ -523,7 +578,11 @@ void xics_common_cpu_setup(struct icp_state *icp, PowerPCCPU *cpu) void xics_cpu_setup(struct icp_state *icp, PowerPCCPU *cpu) { + CPUState *cs = CPU(cpu); + struct icp_server_state *ss = &icp->ss[cs->cpu_index]; + xics_common_cpu_setup(icp, cpu); + vmstate_register(NULL, cs->cpu_index, &vmstate_icp_server, ss); } void xics_common_init(struct icp_state *icp, qemu_irq_handler handler) @@ -555,6 +614,10 @@ static void xics_realize(DeviceState *dev, Error **errp) spapr_rtas_register("ibm,int-off", rtas_int_off); spapr_rtas_register("ibm,int-on", rtas_int_on); + /* We use each the ICS's offset into the global irq number space + * as an instance id. This means we can extend to multiple ICS + * instances without needing to change the savevm format */ + vmstate_register(NULL, icp->ics->offset, &vmstate_ics, icp->ics); } static Property xics_properties[] = { -- 1.7.10.4