Fix EEPROM sizes, add vmstate for EEPROM (hacky)

Author: vintagepc

hw/arm/prusa/prusa-mini.c

@@ -158,7 +158,7 @@ static void prusa_mini_init(MachineState *machine, const mini_config_t* cfg)
         bus = qdev_get_child_bus(stm32_soc_get_periph(dev_soc, STM32_P_I2C1),"i2c");
         dev = qdev_new("at24c-eeprom");
         qdev_prop_set_uint8(dev, "address", 0x53);
-        qdev_prop_set_uint32(dev, "rom-size", 64*KiB);
+        qdev_prop_set_uint32(dev, "rom-size", 64*KiB / 8U);
         dinfo = drive_get(IF_PFLASH, 0, 0);
         if (dinfo) {
             qdev_prop_set_drive(dev, "drive",
@@ -170,7 +170,7 @@ static void prusa_mini_init(MachineState *machine, const mini_config_t* cfg)
         // bus = qdev_get_child_bus(DEVICE(&SOC->i2cs[0]),"i2c");
         dev = qdev_new("at24c-eeprom");
         qdev_prop_set_uint8(dev, "address", 0x57);
-        qdev_prop_set_uint32(dev, "rom-size", 64*KiB);
+        qdev_prop_set_uint32(dev, "rom-size", 64*KiB / 8U);
         dinfo = drive_get(IF_PFLASH, 0, 1);
         if (dinfo) {
             qdev_prop_set_drive(dev, "drive",

hw/nvram/eeprom_at24c.c

@@ -15,6 +15,7 @@
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties-system.h"
 #include "sysemu/block-backend.h"
+#include "migration/vmstate.h"
 #include "qom/object.h"
 
 /* #define DEBUG_AT24C */
@@ -149,18 +150,8 @@ static void at24c_eeprom_realize(DeviceState *dev, Error **errp)
     }
 
     ee->mem = g_malloc0(ee->rsize);
-}
-
-static
-void at24c_eeprom_reset(DeviceState *state)
-{
-    EEPROMState *ee = AT24C_EE(state);
 
-    ee->changed = false;
-    ee->cur = 0;
-    ee->haveaddr = 0;
-    // WTF.. I disabled this because real EEPROMS do not erase themselves on reset. ~VintagePC
-  //  memset(ee->mem, 0, ee->rsize);
+    memset(ee->mem, 0, ee->rsize);
 
     if (ee->blk) {
         int len = blk_pread(ee->blk, 0, ee->mem, ee->rsize);
@@ -173,6 +164,35 @@ void at24c_eeprom_reset(DeviceState *state)
     }
 }
 
+static
+void at24c_eeprom_reset(DeviceState *state)
+{
+    EEPROMState *ee = AT24C_EE(state);
+
+    ee->changed = false;
+    ee->cur = 0;
+    ee->haveaddr = 0;
+    // WTF.. I disabled this because real EEPROMS do not erase themselves on reset. ~VintagePC
+}
+
+static const VMStateDescription vmstate_eeprom_at24c = {
+    .name = TYPE_AT24C_EE,
+    .version_id = 1,
+    .minimum_version_id = 1,
+  //  .post_load = at24c_eeprom_post_load,
+    .fields = (VMStateField[]) {
+        VMSTATE_I2C_SLAVE(parent_obj, EEPROMState),
+        VMSTATE_UINT16(cur, EEPROMState),
+        VMSTATE_UINT32(rsize, EEPROMState),
+        VMSTATE_BOOL(writable, EEPROMState),
+        VMSTATE_BOOL(changed, EEPROMState), 
+        VMSTATE_UINT8(haveaddr, EEPROMState),
+        VMSTATE_VARRAY_UINT32(mem, EEPROMState, rsize, 0,
+                              vmstate_info_uint8, uint8_t),
+        VMSTATE_END_OF_LIST()
+    } 
+};
+
 static Property at24c_eeprom_props[] = {
     DEFINE_PROP_UINT32("rom-size", EEPROMState, rsize, 0),
     DEFINE_PROP_BOOL("writable", EEPROMState, writable, true),
@@ -190,6 +210,7 @@ void at24c_eeprom_class_init(ObjectClass *klass, void *data)
     k->event = &at24c_eeprom_event;
     k->recv = &at24c_eeprom_recv;
     k->send = &at24c_eeprom_send;
+    dc->vmsd = &vmstate_eeprom_at24c;
 
     device_class_set_props(dc, at24c_eeprom_props);
     dc->reset = at24c_eeprom_reset;