[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/20] vmstate: port i2c_bus device
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 03/20] vmstate: port i2c_bus device |
Date: |
Fri, 11 Sep 2009 12:10:23 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
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;
}
--
1.6.2.5
- [Qemu-devel] [PATCH 00/20] VMState: port all i2c devices, Juan Quintela, 2009/09/11
- [Qemu-devel] [PATCH 01/20] qdev: Add support for uint8_t, Juan Quintela, 2009/09/11
- [Qemu-devel] [PATCH 02/20] i2c: addresses are load/save as uint8_t values, change types to reflect this, Juan Quintela, 2009/09/11
- [Qemu-devel] [PATCH 03/20] vmstate: port i2c_bus device,
Juan Quintela <=
- [Qemu-devel] [PATCH 05/20] vmstate: add uint8 array, Juan Quintela, 2009/09/11
- [Qemu-devel] [PATCH 04/20] vmstate: port i2c_slave device, Juan Quintela, 2009/09/11
- [Qemu-devel] [PATCH 06/20] vmstate: create VMSTATE_I2C_SLAVE, Juan Quintela, 2009/09/11
- [Qemu-devel] [PATCH 09/20] vmstate: create VMSTATE_STRUCT_POINTER, Juan Quintela, 2009/09/11
- [Qemu-devel] [PATCH 07/20] vmstate: port wm8750 device, Juan Quintela, 2009/09/11
- [Qemu-devel] [PATCH 12/20] vmstate: create VMSTATE_INT16_ARRAY, Juan Quintela, 2009/09/11
- [Qemu-devel] [PATCH 08/20] vmstate: port max7310 device, Juan Quintela, 2009/09/11
- [Qemu-devel] [PATCH 10/20] vmstate: port pxa2xx_i2c device, Juan Quintela, 2009/09/11
- [Qemu-devel] [PATCH 13/20] tmp105: change len and alorm to uint8_t, Juan Quintela, 2009/09/11
- [Qemu-devel] [PATCH 14/20] vmstate: port wmp105 device, Juan Quintela, 2009/09/11