commit 2b6d744b5761d1a857eaeeffdccd100c74aaddf3
author David 'Digit' Turner <digit@google.com> Tue Apr 15 21:46:45 2014 +0200
committer David 'Digit' Turner <digit@google.com> Fri Jul 18 15:31:40 2014 +0200
tree 72917d385b6d3eab10c0f60c966f613c0acfcb75
parent 5816488abfb06425365999d0e1296a56440e4636

hw/input/pckbd.c: Convert to VMStateDescription.

Change-Id: Ic2a21eba15dbfba4bcb9adeac12609e61fad08d0

hw/input/pckbd.c

diff --git a/hw/input/pckbd.c b/hw/input/pckbd.c
index d5effe6..27407f4 100644
--- a/hw/input/pckbd.c
+++ b/hw/input/pckbd.c
@@ -339,29 +339,28 @@
     s->status = KBD_STAT_CMD | KBD_STAT_UNLOCKED;
 }
 
-static void kbd_save(QEMUFile* f, void* opaque)
-{
-    KBDState *s = (KBDState*)opaque;
-
-    qemu_put_8s(f, &s->write_cmd);
-    qemu_put_8s(f, &s->status);
-    qemu_put_8s(f, &s->mode);
-    qemu_put_8s(f, &s->pending);
-}
-
-static int kbd_load(QEMUFile* f, void* opaque, int version_id)
-{
-    KBDState *s = (KBDState*)opaque;
-
-    if (version_id != 3)
-        return -EINVAL;
-    qemu_get_8s(f, &s->write_cmd);
-    qemu_get_8s(f, &s->status);
-    qemu_get_8s(f, &s->mode);
-    qemu_get_8s(f, &s->pending);
+// Called after loading the keyboard state from snapshot.
+static int kbd_post_load(void* opaque, int version_id) {
+    KBDState *s = opaque;
+    kbd_update_irq(s);
     return 0;
 }
 
+static const VMStateDescription vmstate_kbd = {
+    .name = "pckbd",
+    .version_id = 3,
+    .minimum_version_id = 3,
+    .minimum_version_id_old = 3,
+    .post_load = kbd_post_load,
+    .fields = (VMStateField []) {
+        VMSTATE_UINT8(write_cmd, KBDState),
+        VMSTATE_UINT8(status, KBDState),
+        VMSTATE_UINT8(mode, KBDState),
+        VMSTATE_UINT8(pending, KBDState),
+        VMSTATE_END_OF_LIST()
+    }
+};
+
 void i8042_init(qemu_irq kbd_irq, qemu_irq mouse_irq, uint32_t io_base)
 {
     KBDState *s = &kbd_state;
@@ -370,7 +369,9 @@
     s->irq_mouse = mouse_irq;
 
     kbd_reset(s);
-    register_savevm(NULL, "pckbd", 0, 3, kbd_save, kbd_load, s);
+    //register_savevm(NULL, "pckbd", 0, 3, kbd_save, kbd_load, s);
+    vmstate_register(NULL, 0, &vmstate_kbd, s);
+
     register_ioport_read(io_base, 1, 1, kbd_read_data, s);
     register_ioport_write(io_base, 1, 1, kbd_write_data, s);
     register_ioport_read(io_base + 4, 1, 1, kbd_read_status, s);
@@ -431,7 +432,7 @@
     s->mask = mask;
 
     kbd_reset(s);
-    register_savevm(NULL, "pckbd", 0, 3, kbd_save, kbd_load, s);
+    vmstate_register(NULL, 0, &vmstate_kbd, s);
     s_io_memory = cpu_register_io_memory(kbd_mm_read, kbd_mm_write, s);
     cpu_register_physical_memory(base, size, s_io_memory);