From patchwork Fri Sep 11 10:10:34 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 33438 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 F3D26B7043 for ; Fri, 11 Sep 2009 20:51:50 +1000 (EST) Received: from localhost ([127.0.0.1]:46069 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mm3jI-0005iZ-4l for incoming@patchwork.ozlabs.org; Fri, 11 Sep 2009 06:51:48 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mm38X-0004Ww-46 for qemu-devel@nongnu.org; Fri, 11 Sep 2009 06:13:49 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mm38R-0004UR-TF for qemu-devel@nongnu.org; Fri, 11 Sep 2009 06:13:48 -0400 Received: from [199.232.76.173] (port=36117 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mm38R-0004UC-Gk for qemu-devel@nongnu.org; Fri, 11 Sep 2009 06:13:43 -0400 Received: from mx20.gnu.org ([199.232.41.8]:9662) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Mm38Q-0001OI-NS for qemu-devel@nongnu.org; Fri, 11 Sep 2009 06:13:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mm38P-0006l1-OY for qemu-devel@nongnu.org; Fri, 11 Sep 2009 06:13:42 -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 n8BADaBx031998 for ; Fri, 11 Sep 2009 06:13:36 -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 n8BADJVf025817; Fri, 11 Sep 2009 06:13:35 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Fri, 11 Sep 2009 12:10:34 +0200 Message-Id: <4cc78137c6115000a0ff2c4de0841fb6d8663ca6.1252662256.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 mx20.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) Subject: [Qemu-devel] [PATCH 14/20] vmstate: port wmp105 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/tmp105.c | 56 +++++++++++++++++++++++++------------------------------- 1 files changed, 25 insertions(+), 31 deletions(-) diff --git a/hw/tmp105.c b/hw/tmp105.c index b75a70b..85b35d6 100644 --- a/hw/tmp105.c +++ b/hw/tmp105.c @@ -173,46 +173,40 @@ static void tmp105_event(i2c_slave *i2c, enum i2c_event event) s->len = 0; } -static void tmp105_save(QEMUFile *f, void *opaque) +static void tmp105_post_save(const void *opaque) { - TMP105State *s = (TMP105State *) opaque; - - qemu_put_byte(f, s->len); - qemu_put_8s(f, &s->buf[0]); - qemu_put_8s(f, &s->buf[1]); - - qemu_put_8s(f, &s->pointer); - qemu_put_8s(f, &s->config); - qemu_put_sbe16s(f, &s->temperature); - qemu_put_sbe16s(f, &s->limit[0]); - qemu_put_sbe16s(f, &s->limit[1]); - qemu_put_byte(f, s->alarm); + TMP105State *s = (void *)opaque; s->faults = tmp105_faultq[(s->config >> 3) & 3]; /* F */ - - i2c_slave_save(f, &s->i2c); } -static int tmp105_load(QEMUFile *f, void *opaque, int version_id) +static int tmp105_post_load(void *opaque) { - TMP105State *s = (TMP105State *) opaque; - - s->len = qemu_get_byte(f); - qemu_get_8s(f, &s->buf[0]); - qemu_get_8s(f, &s->buf[1]); - - qemu_get_8s(f, &s->pointer); - qemu_get_8s(f, &s->config); - qemu_get_sbe16s(f, &s->temperature); - qemu_get_sbe16s(f, &s->limit[0]); - qemu_get_sbe16s(f, &s->limit[1]); - s->alarm = qemu_get_byte(f); + TMP105State *s = opaque; tmp105_interrupt_update(s); - - i2c_slave_load(f, &s->i2c); return 0; } +static const VMStateDescription vmstate_tmp105 = { + .name = "TMP105", + .version_id = 0, + .minimum_version_id = 0, + .minimum_version_id_old = 0, + .post_save = tmp105_post_save, + .post_load = tmp105_post_load, + .fields = (VMStateField []) { + VMSTATE_UINT8(len, TMP105State), + VMSTATE_UINT8_ARRAY(buf, TMP105State, 2), + VMSTATE_UINT8(pointer, TMP105State), + VMSTATE_UINT8(config, TMP105State), + VMSTATE_INT16(temperature, TMP105State), + VMSTATE_INT16_ARRAY(limit, TMP105State, 2), + VMSTATE_UINT8(alarm, TMP105State), + VMSTATE_I2C_SLAVE(i2c, TMP105State), + VMSTATE_END_OF_LIST() + } +}; + static void tmp105_reset(i2c_slave *i2c) { TMP105State *s = (TMP105State *) i2c; @@ -234,7 +228,7 @@ static int tmp105_init(i2c_slave *i2c) tmp105_reset(&s->i2c); - register_savevm("TMP105", -1, 0, tmp105_save, tmp105_load, s); + vmstate_register(-1, &vmstate_tmp105, s); return 0; }