Include hw/hw.h exactly where needed

[qemu.git] / hw / misc / imx6_src.c

diff --git a/hw/misc/imx6_src.c b/hw/misc/imx6_src.c
index edbb756c3652a4825e81951639ca5fdb90c4a5fb..0be683de06969f52ec29c397dc934dedff7533ad 100644 (file)
--- a/hw/misc/imx6_src.c
+++ b/hw/misc/imx6_src.c
@@ -10,9 +10,11 @@
 
 #include "qemu/osdep.h"
 #include "hw/misc/imx6_src.h"
+#include "migration/vmstate.h"
 #include "sysemu/sysemu.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"
+#include "qemu/module.h"
 #include "arm-powerctl.h"
 #include "qom/cpu.h"
 
@@ -143,13 +145,17 @@ static void imx6_defer_clear_reset_bit(int cpuid,
                                        unsigned long reset_shift)
 {
     struct SRCSCRResetInfo *ri;
+    CPUState *cpu = arm_get_cpu_by_id(cpuid);
+
+    if (!cpu) {
+        return;
+    }
 
     ri = g_malloc(sizeof(struct SRCSCRResetInfo));
     ri->s = s;
     ri->reset_bit = reset_shift;
 
-    async_run_on_cpu(arm_get_cpu_by_id(cpuid), imx6_clear_reset_bit,
-                     RUN_ON_CPU_HOST_PTR(ri));
+    async_run_on_cpu(cpu, imx6_clear_reset_bit, RUN_ON_CPU_HOST_PTR(ri));
 }