commit 69be6ef6dd80335ace8389b18034c5711aaee551
author David 'Digit' Turner <digit@google.com> Tue Apr 15 18:45:14 2014 +0200
committer David 'Digit' Turner <digit@google.com> Fri Jul 18 15:31:13 2014 +0200
tree c1e8d8fb634bbaf577203f82375dfe90acdfa860
parent 259cbeea4aa12e21e17066e7a2debafcd2fa8ecf

goldfish/interrupt: Properly restore IRQ on reload.

Change-Id: Iea925eab83271d6ca84981e37edb017500772770

hw/android/goldfish/interrupt.c

diff --git a/hw/android/goldfish/interrupt.c b/hw/android/goldfish/interrupt.c
index 23a1610..5b60151 100644
--- a/hw/android/goldfish/interrupt.c
+++ b/hw/android/goldfish/interrupt.c
@@ -50,16 +50,6 @@
     qemu_put_struct(f, goldfish_int_fields, s);
 }
 
-static int  goldfish_int_load(QEMUFile*  f, void*  opaque, int  version_id)
-{
-    struct goldfish_int_state*  s = opaque;
-
-    if (version_id != GOLDFISH_INT_SAVE_VERSION)
-        return -1;
-
-    return qemu_get_struct(f, goldfish_int_fields, s);
-}
-
 static void goldfish_int_update(struct goldfish_int_state *s)
 {
     uint32_t flags;
@@ -71,6 +61,20 @@
     qemu_set_irq(s->parent_fiq, flags != 0);
 }
 
+static int  goldfish_int_load(QEMUFile*  f, void*  opaque, int  version_id)
+{
+    struct goldfish_int_state*  s = opaque;
+
+    if (version_id != GOLDFISH_INT_SAVE_VERSION)
+        return -1;
+
+    if (qemu_get_struct(f, goldfish_int_fields, s) < 0)
+        return -1;
+
+    goldfish_int_update(s);
+    return 0;
+}
+
 static void goldfish_int_set_irq(void *opaque, int irq, int level)
 {
     struct goldfish_int_state *s = (struct goldfish_int_state *)opaque;