From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Msjdh-00050m-S8 for qemu-devel@nongnu.org; Tue, 29 Sep 2009 16:49:37 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Msjdb-0004wY-Bw for qemu-devel@nongnu.org; Tue, 29 Sep 2009 16:49:36 -0400 Received: from [199.232.76.173] (port=55211 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Msjda-0004wL-Iw for qemu-devel@nongnu.org; Tue, 29 Sep 2009 16:49:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:24529) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MsjdZ-0002PZ-RC for qemu-devel@nongnu.org; Tue, 29 Sep 2009 16:49:30 -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 n8TKnSxs002522 for ; Tue, 29 Sep 2009 16:49:29 -0400 From: Juan Quintela Date: Tue, 29 Sep 2009 22:48:27 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PATCH 08/49] vmstate: port i2c_bus device List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@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 1033e00..1641cec 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(void *opaque) { - i2c_bus *bus = (i2c_bus *)opaque; - bus->saved_address = bus->current_dev ? bus->current_dev->address : -1; + i2c_bus *bus = 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, int version_id) { - 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; } -- 1.6.2.5