[Qemu-devel] [PATCH] Reset interrupt_request on loadvm

[Jan Kiszka <jan.kiszka@web.de>]

Trying to use savevm/loadvm to reduce my debug round-trip times, I came
across this bug. The following reset is required to avoid spurious IRQ
injections after the system state has been loaded from a snapshot. Not
sure if it is a regression of SVN head, but Qemu from my Suse 10.3 seems
to be immune.

Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
---
 cpu-defs.h |    3 +++
 vl.c       |    3 +++
 2 files changed, 6 insertions(+)

Index: b/cpu-defs.h
===================================================================
--- a/cpu-defs.h
+++ b/cpu-defs.h
@@ -172,3 +172,6 @@ typedef struct CPUTLBEntry {
     const char *cpu_model_str;
 
 #endif
+
+#define foreach_cpu(env) \
+    for(env = first_cpu; env != NULL; env = env->next_cpu)
Index: b/vl.c
===================================================================
--- a/vl.c
+++ b/vl.c
@@ -6032,6 +6032,7 @@ static SaveStateEntry *find_se(const cha
 static int qemu_loadvm_state(QEMUFile *f)
 {
     SaveStateEntry *se;
+    CPUState *env;
     int len, ret, instance_id, record_len, version_id;
     int64_t total_len, end_pos, cur_pos;
     unsigned int v;
@@ -6046,6 +6047,8 @@ static int qemu_loadvm_state(QEMUFile *f
         ret = -1;
         goto the_end;
     }
+    foreach_cpu(env)
+        env->interrupt_request = 0;
     total_len = qemu_get_be64(f);
     end_pos = total_len + qemu_ftell(f);
     for(;;) {