--- qemu/hw/i2c.c	2018/04/24 17:23:17	1.1.1.3
+++ qemu/hw/i2c.c	2018/04/24 17:36:51	1.1.1.5
@@ -14,55 +14,59 @@ struct i2c_bus
     BusState qbus;
     i2c_slave *current_dev;
     i2c_slave *dev;
-    int saved_address;
+    uint8_t saved_address;
 };
 
 static struct BusInfo i2c_bus_info = {
     .name = "I2C",
     .size = sizeof(i2c_bus),
     .props = (Property[]) {
-        {
-            .name   = "address",
-            .info   = &qdev_prop_uint32,
-            .offset = offsetof(struct i2c_slave, address),
-        },
-        {/* end of list */}
+        DEFINE_PROP_UINT8("address", struct i2c_slave, address, 0),
+        DEFINE_PROP_END_OF_LIST(),
     }
 };
 
-static void i2c_bus_save(QEMUFile *f, void *opaque)
+static void i2c_bus_pre_save(void *opaque)
 {
-    i2c_bus *bus = (i2c_bus *)opaque;
+    i2c_bus *bus = opaque;
 
-    qemu_put_byte(f, bus->current_dev ? bus->current_dev->address : -1);
+    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.  */
-    bus->saved_address = (int8_t) qemu_get_byte(f);
     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;
 }
 
-void i2c_set_slave_address(i2c_slave *dev, int address)
+void i2c_set_slave_address(i2c_slave *dev, uint8_t address)
 {
     dev->address = address;
 }
@@ -75,15 +79,17 @@ int i2c_bus_busy(i2c_bus *bus)
 
 /* Returns non-zero if the address is not valid.  */
 /* TODO: Make this handle multiple masters.  */
-int i2c_start_transfer(i2c_bus *bus, int address, int recv)
+int i2c_start_transfer(i2c_bus *bus, uint8_t address, int recv)
 {
     DeviceState *qdev;
     i2c_slave *slave = NULL;
 
-    LIST_FOREACH(qdev, &bus->qbus.children, sibling) {
-        slave = I2C_SLAVE_FROM_QDEV(qdev);
-        if (slave->address == address)
+    QLIST_FOREACH(qdev, &bus->qbus.children, sibling) {
+        i2c_slave *candidate = I2C_SLAVE_FROM_QDEV(qdev);
+        if (candidate->address == address) {
+            slave = candidate;
             break;
+        }
     }
 
     if (!slave)
@@ -138,29 +144,37 @@ void i2c_nack(i2c_bus *bus)
     dev->info->event(dev, I2C_NACK);
 }
 
-void i2c_slave_save(QEMUFile *f, i2c_slave *dev)
-{
-    qemu_put_byte(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));
-    dev->address = qemu_get_byte(f);
     if (bus->saved_address == dev->address) {
         bus->current_dev = dev;
     }
+    return 0;
 }
 
-static void i2c_slave_qdev_init(DeviceState *dev, DeviceInfo *base)
+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()
+    }
+};
+
+static int i2c_slave_qdev_init(DeviceState *dev, DeviceInfo *base)
 {
     I2CSlaveInfo *info = container_of(base, I2CSlaveInfo, qdev);
     i2c_slave *s = I2C_SLAVE_FROM_QDEV(dev);
 
     s->info = info;
 
-    info->init(s);
+    return info->init(s);
 }
 
 void i2c_register_slave(I2CSlaveInfo *info)
@@ -171,12 +185,12 @@ void i2c_register_slave(I2CSlaveInfo *in
     qdev_register(&info->qdev);
 }
 
-DeviceState *i2c_create_slave(i2c_bus *bus, const char *name, int addr)
+DeviceState *i2c_create_slave(i2c_bus *bus, const char *name, uint8_t addr)
 {
     DeviceState *dev;
 
     dev = qdev_create(&bus->qbus, name);
-    qdev_prop_set_uint32(dev, "address", addr);
-    qdev_init(dev);
+    qdev_prop_set_uint8(dev, "address", addr);
+    qdev_init_nofail(dev);
     return dev;
 }