From patchwork Thu Sep 10 01:04:41 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 33258 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 CBAC2B7088 for ; Thu, 10 Sep 2009 11:43:52 +1000 (EST) Received: from localhost ([127.0.0.1]:49326 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlYhR-0001Cc-Sn for incoming@patchwork.ozlabs.org; Wed, 09 Sep 2009 21:43:49 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MlY6F-0004db-O5 for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:05:23 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MlY6A-0004YX-Nq for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:05:23 -0400 Received: from [199.232.76.173] (port=48268 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlY69-0004Y4-AO for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:05:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26358) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MlY68-0002nz-N9 for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:05:17 -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 n8A15FIP021433 for ; Wed, 9 Sep 2009 21:05:15 -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 n8A14oon020882; Wed, 9 Sep 2009 21:05:14 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 10 Sep 2009 03:04:41 +0200 Message-Id: <6ff1ce2455ddd7dd4573ea95a5b11609b71aa6bc.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 20/26] vmstate: port pckbd 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/pckbd.c | 41 ++++++++++++++++------------------------- 1 files changed, 16 insertions(+), 25 deletions(-) diff --git a/hw/pckbd.c b/hw/pckbd.c index 3f83320..f119a33 100644 --- a/hw/pckbd.c +++ b/hw/pckbd.c @@ -339,28 +339,19 @@ static void kbd_reset(void *opaque) s->status = KBD_STAT_CMD | KBD_STAT_UNLOCKED; } -static void kbd_save(QEMUFile* f, void* opaque) -{ - KBDState *s = (KBDState*)opaque; - - qemu_put_8s(f, &s->write_cmd); - qemu_put_8s(f, &s->status); - qemu_put_8s(f, &s->mode); - qemu_put_8s(f, &s->pending); -} - -static int kbd_load(QEMUFile* f, void* opaque, int version_id) -{ - KBDState *s = (KBDState*)opaque; - - if (version_id != 3) - return -EINVAL; - qemu_get_8s(f, &s->write_cmd); - qemu_get_8s(f, &s->status); - qemu_get_8s(f, &s->mode); - qemu_get_8s(f, &s->pending); - return 0; -} +static const VMStateDescription vmstate_kbd = { + .name = "pckbd", + .version_id = 3, + .minimum_version_id = 3, + .minimum_version_id_old = 3, + .fields = (VMStateField []) { + VMSTATE_UINT8(write_cmd, KBDState), + VMSTATE_UINT8(status, KBDState), + VMSTATE_UINT8(mode, KBDState), + VMSTATE_UINT8(pending, KBDState), + VMSTATE_END_OF_LIST() + } +}; void i8042_init(qemu_irq kbd_irq, qemu_irq mouse_irq, uint32_t io_base) { @@ -370,7 +361,7 @@ void i8042_init(qemu_irq kbd_irq, qemu_irq mouse_irq, uint32_t io_base) s->irq_mouse = mouse_irq; kbd_reset(s); - register_savevm("pckbd", 0, 3, kbd_save, kbd_load, s); + vmstate_register(0, &vmstate_kbd, s); register_ioport_read(io_base, 1, 1, kbd_read_data, s); register_ioport_write(io_base, 1, 1, kbd_write_data, s); register_ioport_read(io_base + 4, 1, 1, kbd_read_status, s); @@ -429,7 +420,7 @@ void i8042_mm_init(qemu_irq kbd_irq, qemu_irq mouse_irq, s->mask = mask; kbd_reset(s); - register_savevm("pckbd", 0, 3, kbd_save, kbd_load, s); + vmstate_register(0, &vmstate_kbd, s); s_io_memory = cpu_register_io_memory(kbd_mm_read, kbd_mm_write, s); cpu_register_physical_memory(base, size, s_io_memory); @@ -454,7 +445,7 @@ static int i8042_initfn(ISADevice *dev) isa_init_irq(dev, &s->irq_mouse); kbd_reset(s); - register_savevm("pckbd", 0, 3, kbd_save, kbd_load, s); + vmstate_register(0, &vmstate_kbd, s); register_ioport_read(dev->iobase[0], 1, 1, kbd_read_data, s); register_ioport_write(dev->iobase[0], 1, 1, kbd_write_data, s); register_ioport_read(dev->iobase[1], 1, 1, kbd_read_status, s);