commit 73bdcd85baef54a76ac184add5da51f142f3655a
author David 'Digit' Turner <digit@google.com> Wed Apr 16 15:14:53 2014 +0200
committer David 'Digit' Turner <digit@google.com> Fri Jul 18 15:31:40 2014 +0200
tree 2281c2d8f2166a5397095bc49233484c6818006b
parent d8e4633d3d79959e08bd812cb786e4cd1863f4aa

hw/nvram/fw_cfg.c: Convert to VMStateDescription.

Change-Id: I65aa27fcd256535530404d2ef5affa3e29bfd687

hw/nvram/fw_cfg.c

diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index 3fe29ad..21a7bd4 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -165,26 +165,16 @@
     fw_cfg_select(s, 0);
 }
 
-static void fw_cfg_save(QEMUFile *f, void *opaque)
-{
-    FWCfgState *s = opaque;
-
-    qemu_put_be16s(f, &s->cur_entry);
-    qemu_put_be16s(f, &s->cur_offset);
-}
-
-static int fw_cfg_load(QEMUFile *f, void *opaque, int version_id)
-{
-    FWCfgState *s = opaque;
-
-    if (version_id > 1)
-        return -EINVAL;
-
-    qemu_get_be16s(f, &s->cur_entry);
-    qemu_get_be16s(f, &s->cur_offset);
-
-    return 0;
-}
+static const VMStateDescription vmstate_fw_cfg = {
+    .name = "fw_cfg",
+    .version_id = 1,
+    .minimum_version_id = 1,
+    .fields = (VMStateField []) {
+        VMSTATE_UINT16(cur_entry, FWCfgState),
+        VMSTATE_UINT16(cur_offset, FWCfgState),
+        VMSTATE_END_OF_LIST()
+    }
+};
 
 int fw_cfg_add_bytes(void *opaque, uint16_t key, uint8_t *data, uint16_t len)
 {
@@ -281,7 +271,7 @@
     fw_cfg_add_i16(s, FW_CFG_NOGRAPHIC, (uint16_t)(display_type == DT_NOGRAPHIC));
     fw_cfg_add_i16(s, FW_CFG_NB_CPUS, (uint16_t)smp_cpus);
 
-    register_savevm(NULL, "fw_cfg", -1, 1, fw_cfg_save, fw_cfg_load, s);
+    vmstate_register(NULL, -1, &vmstate_fw_cfg, s);
     qemu_register_reset(fw_cfg_reset, 0, s);
     fw_cfg_reset(s);