[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 14/20] vmstate: port wmp105 device
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 14/20] vmstate: port wmp105 device |
Date: |
Fri, 11 Sep 2009 12:10:34 +0200 |
Signed-off-by: Juan Quintela <address@hidden>
---
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;
}
--
1.6.2.5
- [Qemu-devel] [PATCH 03/20] vmstate: port i2c_bus device, (continued)
- [Qemu-devel] [PATCH 03/20] vmstate: port i2c_bus device, Juan Quintela, 2009/09/11
- [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 <=
- [Qemu-devel] [PATCH 16/20] vmstate: port twl92230 device, Juan Quintela, 2009/09/11
- [Qemu-devel] [PATCH 17/20] vmstate: add support for arrays of pointers, Juan Quintela, 2009/09/11
- [Qemu-devel] [PATCH 19/20] vmstate: port lm832x device, Juan Quintela, 2009/09/11
- [Qemu-devel] [PATCH 11/20] vmstate: port ssd0303 device, Juan Quintela, 2009/09/11
- Re: [Qemu-devel] [PATCH 00/20] VMState: port all i2c devices, Juha.Riihimaki, 2009/09/11
- [Qemu-devel] [PATCH 15/20] twl92230: change pwrbtn_state to uint8_t, Juan Quintela, 2009/09/11
- [Qemu-devel] [PATCH 20/20] vmstate: remove i2c_slave_load/save, Juan Quintela, 2009/09/11