From patchwork Thu Sep 10 01:04:40 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 33256 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 0BB5FB7043 for ; Thu, 10 Sep 2009 11:40:41 +1000 (EST) Received: from localhost ([127.0.0.1]:51165 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlYeM-0000GZ-Ee for incoming@patchwork.ozlabs.org; Wed, 09 Sep 2009 21:40:38 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MlY6D-0004bQ-DA for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:05:21 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MlY68-0004XL-SA for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:05:21 -0400 Received: from [199.232.76.173] (port=48267 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MlY67-0004Wy-SZ for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:05:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:8848) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MlY67-0002nf-9S for qemu-devel@nongnu.org; Wed, 09 Sep 2009 21:05:15 -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 n8A15EKv020375 for ; Wed, 9 Sep 2009 21:05:14 -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 n8A14oom020882; Wed, 9 Sep 2009 21:05:13 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 10 Sep 2009 03:04:40 +0200 Message-Id: <76305e18846167542007a05db3986b961ff4df39.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 19/26] vmstate: port vmmouse 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/vmmouse.c | 48 ++++++++++++++++++++---------------------------- 1 files changed, 20 insertions(+), 28 deletions(-) diff --git a/hw/vmmouse.c b/hw/vmmouse.c index c70e825..c207bb2 100644 --- a/hw/vmmouse.c +++ b/hw/vmmouse.c @@ -53,6 +53,7 @@ typedef struct _VMMouseState { uint32_t queue[VMMOUSE_QUEUE_SIZE]; + int32_t queue_size; uint16_t nb_queue; uint16_t status; uint8_t absolute; @@ -234,40 +235,30 @@ static uint32_t vmmouse_ioport_read(void *opaque, uint32_t addr) return data[0]; } -static void vmmouse_save(QEMUFile *f, void *opaque) +static int vmmouse_post_load(void *opaque) { VMMouseState *s = opaque; - int i; - - qemu_put_be32(f, VMMOUSE_QUEUE_SIZE); - for (i = 0; i < VMMOUSE_QUEUE_SIZE; i++) - qemu_put_be32s(f, &s->queue[i]); - qemu_put_be16s(f, &s->nb_queue); - qemu_put_be16s(f, &s->status); - qemu_put_8s(f, &s->absolute); -} - -static int vmmouse_load(QEMUFile *f, void *opaque, int version_id) -{ - VMMouseState *s = opaque; - int i; - - if (version_id != 0) - return -EINVAL; - - if (qemu_get_be32(f) != VMMOUSE_QUEUE_SIZE) - return -EINVAL; - for (i = 0; i < VMMOUSE_QUEUE_SIZE; i++) - qemu_get_be32s(f, &s->queue[i]); - qemu_get_be16s(f, &s->nb_queue); - qemu_get_be16s(f, &s->status); - qemu_get_8s(f, &s->absolute); vmmouse_update_handler(s); - return 0; } +static const VMStateDescription vmstate_vmmouse = { + .name = "vmmouse", + .version_id = 0, + .minimum_version_id = 0, + .minimum_version_id_old = 0, + .post_load = vmmouse_post_load, + .fields = (VMStateField []) { + VMSTATE_INT32_EQUAL(queue_size, VMMouseState), + VMSTATE_UINT32_ARRAY(queue, VMMouseState, VMMOUSE_QUEUE_SIZE), + VMSTATE_UINT16(nb_queue, VMMouseState), + VMSTATE_UINT16(status, VMMouseState), + VMSTATE_UINT8(absolute, VMMouseState), + VMSTATE_END_OF_LIST() + } +}; + void *vmmouse_init(void *m) { VMMouseState *s = NULL; @@ -278,11 +269,12 @@ void *vmmouse_init(void *m) s->status = 0xffff; s->ps2_mouse = m; + s->queue_size = VMMOUSE_QUEUE_SIZE; vmport_register(VMMOUSE_STATUS, vmmouse_ioport_read, s); vmport_register(VMMOUSE_COMMAND, vmmouse_ioport_read, s); vmport_register(VMMOUSE_DATA, vmmouse_ioport_read, s); - register_savevm("vmmouse", 0, 0, vmmouse_save, vmmouse_load, s); + vmstate_register(0, &vmstate_vmmouse, s); return s; }