From patchwork Thu Sep 10 01:04:43 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 33259 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id 5AA8CB7093 for ; Thu, 10 Sep 2009 11:45:24 +1000 (EST) Received: from localhost ([127.0.0.1]:49955 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlYiv-0001bn-37 for incoming@patchwork.ozlabs.org; Wed, 09 Sep 2009 21:45:21 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MlY6H-0004fd-9Y for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:05:25 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MlY6C-0004aH-8U for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:05:24 -0400 Received: from [199.232.76.173] (port=48270 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlY6B-0004Zs-K4 for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:05:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44124) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MlY6A-0002oN-SF for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:05:19 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8A15IWI017405 for ; Wed, 9 Sep 2009 21:05:18 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8A14oop020882; Wed, 9 Sep 2009 21:05:17 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 10 Sep 2009 03:04:43 +0200 Message-Id: <81fb92575b1ae7979e0c4d93ec165dbb342a630f.1252543872.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 22/26] vmstate: port ioapic device X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Juan Quintela --- hw/ioapic.c | 39 ++++++++++++--------------------------- 1 files changed, 12 insertions(+), 27 deletions(-) diff --git a/hw/ioapic.c b/hw/ioapic.c index b232527..b0ad78f 100644 --- a/hw/ioapic.c +++ b/hw/ioapic.c @@ -191,33 +191,18 @@ static void ioapic_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t va } } -static void ioapic_save(QEMUFile *f, void *opaque) -{ - IOAPICState *s = opaque; - int i; - - qemu_put_8s(f, &s->id); - qemu_put_8s(f, &s->ioregsel); - for (i = 0; i < IOAPIC_NUM_PINS; i++) { - qemu_put_be64s(f, &s->ioredtbl[i]); - } -} - -static int ioapic_load(QEMUFile *f, void *opaque, int version_id) -{ - IOAPICState *s = opaque; - int i; - - if (version_id != 1) - return -EINVAL; - - qemu_get_8s(f, &s->id); - qemu_get_8s(f, &s->ioregsel); - for (i = 0; i < IOAPIC_NUM_PINS; i++) { - qemu_get_be64s(f, &s->ioredtbl[i]); +static const VMStateDescription vmstate_ioapic = { + .name = "ioapic", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 1, + .fields = (VMStateField []) { + VMSTATE_UINT8(id, IOAPICState), + VMSTATE_UINT8(ioregsel, IOAPICState), + VMSTATE_UINT64_ARRAY(ioredtbl, IOAPICState, IOAPIC_NUM_PINS), + VMSTATE_END_OF_LIST() } - return 0; -} +}; static void ioapic_reset(void *opaque) { @@ -254,7 +239,7 @@ qemu_irq *ioapic_init(void) ioapic_mem_write, s); cpu_register_physical_memory(0xfec00000, 0x1000, io_memory); - register_savevm("ioapic", 0, 1, ioapic_save, ioapic_load, s); + vmstate_register(0, &vmstate_ioapic, s); qemu_register_reset(ioapic_reset, s); irq = qemu_allocate_irqs(ioapic_set_irq, s, IOAPIC_NUM_PINS);