From patchwork Tue Sep 29 20:48:28 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 34462 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 ozlabs.org (Postfix) with ESMTPS id 4F5E8B7BA8 for ; Wed, 30 Sep 2009 07:13:32 +1000 (EST) Received: from localhost ([127.0.0.1]:36572 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Msk0n-0005Xr-AD for incoming@patchwork.ozlabs.org; Tue, 29 Sep 2009 17:13:29 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Msjdk-000532-PV for qemu-devel@nongnu.org; Tue, 29 Sep 2009 16:49:40 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Msjdc-0004xF-K0 for qemu-devel@nongnu.org; Tue, 29 Sep 2009 16:49:39 -0400 Received: from [199.232.76.173] (port=55213 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Msjdc-0004xA-2j for qemu-devel@nongnu.org; Tue, 29 Sep 2009 16:49:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7791) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Msjdb-0002Qf-F1 for qemu-devel@nongnu.org; Tue, 29 Sep 2009 16:49:31 -0400 Received: from int-mx03.intmail.prod.int.phx2.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n8TKnUuV021595 for ; Tue, 29 Sep 2009 16:49:30 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx03.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n8TKnHXi006885; Tue, 29 Sep 2009 16:49:29 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Tue, 29 Sep 2009 22:48:28 +0200 Message-Id: <958e6e5d3be0201712b420d5c20d91ff364323bf.1254255997.git.quintela@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.16 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Subject: [Qemu-devel] [PATCH 09/49] vmstate: port i2c_slave 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/i2c.c | 33 ++++++++++++++++++++++++++------- 1 files changed, 26 insertions(+), 7 deletions(-) diff --git a/hw/i2c.c b/hw/i2c.c index 1641cec..db9283d 100644 --- a/hw/i2c.c +++ b/hw/i2c.c @@ -142,19 +142,38 @@ void i2c_nack(i2c_bus *bus) dev->info->event(dev, I2C_NACK); } -void i2c_slave_save(QEMUFile *f, i2c_slave *dev) -{ - qemu_put_8s(f, &dev->address); -} - -void i2c_slave_load(QEMUFile *f, i2c_slave *dev) +static int i2c_slave_post_load(void *opaque, int version_id) { + i2c_slave *dev = opaque; i2c_bus *bus; bus = FROM_QBUS(i2c_bus, qdev_get_parent_bus(&dev->qdev)); - qemu_get_8s(f, &dev->address); if (bus->saved_address == dev->address) { bus->current_dev = dev; } + return 0; +} + +static const VMStateDescription vmstate_i2c_slave = { + .name = "i2c_slave", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 1, + .post_load = i2c_slave_post_load, + .fields = (VMStateField []) { + VMSTATE_UINT8(address, i2c_slave), + VMSTATE_END_OF_LIST() + } +}; + +void i2c_slave_save(QEMUFile *f, i2c_slave *dev) +{ + vmstate_save_state(f, &vmstate_i2c_slave, dev); +} + +void i2c_slave_load(QEMUFile *f, i2c_slave *dev) +{ + vmstate_load_state(f, &vmstate_i2c_slave, dev, + vmstate_i2c_slave.version_id); } static int i2c_slave_qdev_init(DeviceState *dev, DeviceInfo *base)