From patchwork Fri Sep 11 10:10:23 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juan Quintela X-Patchwork-Id: 33427 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 921B2B7043 for ; Fri, 11 Sep 2009 20:22:15 +1000 (EST) Received: from localhost ([127.0.0.1]:52302 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mm3Ge-0006lq-Hu for incoming@patchwork.ozlabs.org; Fri, 11 Sep 2009 06:22:12 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mm38F-0004Np-7X for qemu-devel@nongnu.org; Fri, 11 Sep 2009 06:13:31 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mm38A-0004Mi-0c for qemu-devel@nongnu.org; Fri, 11 Sep 2009 06:13:30 -0400 Received: from [199.232.76.173] (port=36102 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mm389-0004Me-Ri for qemu-devel@nongnu.org; Fri, 11 Sep 2009 06:13:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:8282) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mm389-0000tG-47 for qemu-devel@nongnu.org; Fri, 11 Sep 2009 06:13:25 -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 n8BADNf5028780 for ; Fri, 11 Sep 2009 06:13:24 -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 n8BADJVU025817; Fri, 11 Sep 2009 06:13:23 -0400 From: Juan Quintela To: qemu-devel@nongnu.org Date: Fri, 11 Sep 2009 12:10:23 +0200 Message-Id: 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 03/20] vmstate: port i2c_bus 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 | 31 +++++++++++++++++++------------ 1 files changed, 19 insertions(+), 12 deletions(-) diff --git a/hw/i2c.c b/hw/i2c.c index e18c00e..8d9e950 100644 --- a/hw/i2c.c +++ b/hw/i2c.c @@ -26,36 +26,43 @@ static struct BusInfo i2c_bus_info = { } }; -static void i2c_bus_save(QEMUFile *f, void *opaque) +static void i2c_bus_pre_save(const void *opaque) { - i2c_bus *bus = (i2c_bus *)opaque; - bus->saved_address = bus->current_dev ? bus->current_dev->address : -1; + i2c_bus *bus = (void *)opaque; - qemu_put_8s(f, &bus->saved_address); + bus->saved_address = bus->current_dev ? bus->current_dev->address : -1; } -static int i2c_bus_load(QEMUFile *f, void *opaque, int version_id) +static int i2c_bus_post_load(void *opaque) { - i2c_bus *bus = (i2c_bus *)opaque; - - if (version_id != 1) - return -EINVAL; + i2c_bus *bus = opaque; /* The bus is loaded before attached devices, so load and save the current device id. Devices will check themselves as loaded. */ - qemu_get_8s(f, &bus->saved_address); bus->current_dev = NULL; - return 0; } +static const VMStateDescription vmstate_i2c_bus = { + .name = "i2c_bus", + .version_id = 1, + .minimum_version_id = 1, + .minimum_version_id_old = 1, + .pre_save = i2c_bus_pre_save, + .post_load = i2c_bus_post_load, + .fields = (VMStateField []) { + VMSTATE_UINT8(saved_address, i2c_bus), + VMSTATE_END_OF_LIST() + } +}; + /* Create a new I2C bus. */ i2c_bus *i2c_init_bus(DeviceState *parent, const char *name) { i2c_bus *bus; bus = FROM_QBUS(i2c_bus, qbus_create(&i2c_bus_info, parent, name)); - register_savevm("i2c_bus", -1, 1, i2c_bus_save, i2c_bus_load, bus); + vmstate_register(-1, &vmstate_i2c_bus, bus); return bus; }