qemu: introduce qemu_cpu_kick (Marcelo Tosatti)
To notify cpu of pending interrupt.
Signed-off-by: Marcelo Tosatti <[email protected]>
Signed-off-by: Anthony Liguori <[email protected]>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7243 c046a42c-6fe2-441c-8c8c-71466251a162
diff --git a/exec.c b/exec.c
index 8245ac0..23013fb 100644
--- a/exec.c
+++ b/exec.c
@@ -1542,6 +1542,17 @@
old_mask = env->interrupt_request;
env->interrupt_request |= mask;
+#ifndef CONFIG_USER_ONLY
+ /*
+ * If called from iothread context, wake the target cpu in
+ * case its halted.
+ */
+ if (!qemu_cpu_self(env)) {
+ qemu_cpu_kick(env);
+ return;
+ }
+#endif
+
if (use_icount) {
env->icount_decr.u16.high = 0xffff;
#ifndef CONFIG_USER_ONLY
diff --git a/qemu-common.h b/qemu-common.h
index e6a555e..c90c3e3 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -189,6 +189,10 @@
/* Force QEMU to process pending events */
void qemu_notify_event(void);
+/* Unblock cpu */
+void qemu_cpu_kick(void *env);
+int qemu_cpu_self(void *env);
+
#ifdef CONFIG_USER_ONLY
#define qemu_init_vcpu(env) do { } while (0)
#else
diff --git a/vl.c b/vl.c
index 7440464..92f3014 100644
--- a/vl.c
+++ b/vl.c
@@ -3740,6 +3740,16 @@
return;
}
+int qemu_cpu_self(void *env)
+{
+ return 1;
+}
+
+void qemu_cpu_kick(void *env)
+{
+ return;
+}
+
#ifdef _WIN32
static void host_main_loop_wait(int *timeout)
{
