[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/9] Redirect cpu_interrupt to callback handler
From: |
Marcelo Tosatti |
Subject: |
[Qemu-devel] [PATCH 6/9] Redirect cpu_interrupt to callback handler |
Date: |
Mon, 2 May 2011 15:32:42 -0300 |
From: Jan Kiszka <address@hidden>
This allows to override the interrupt handling of QEMU in system mode.
KVM will make use of it to set a specialized handler.
Signed-off-by: Jan Kiszka <address@hidden>
Signed-off-by: Marcelo Tosatti <address@hidden>
---
cpu-all.h | 14 +++++++++++++-
exec.c | 4 +++-
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/cpu-all.h b/cpu-all.h
index 0bae6df..88126ea 100644
--- a/cpu-all.h
+++ b/cpu-all.h
@@ -799,7 +799,19 @@ extern CPUState *cpu_single_env;
#define CPU_INTERRUPT_SIPI 0x800 /* SIPI pending. */
#define CPU_INTERRUPT_MCE 0x1000 /* (x86 only) MCE pending. */
-void cpu_interrupt(CPUState *s, int mask);
+#ifndef CONFIG_USER_ONLY
+typedef void (*CPUInterruptHandler)(CPUState *, int);
+
+extern CPUInterruptHandler cpu_interrupt_handler;
+
+static inline void cpu_interrupt(CPUState *s, int mask)
+{
+ cpu_interrupt_handler(s, mask);
+}
+#else /* USER_ONLY */
+void cpu_interrupt(CPUState *env, int mask);
+#endif /* USER_ONLY */
+
void cpu_reset_interrupt(CPUState *env, int mask);
void cpu_exit(CPUState *s);
diff --git a/exec.c b/exec.c
index d6d8a89..a718d74 100644
--- a/exec.c
+++ b/exec.c
@@ -1631,7 +1631,7 @@ static void cpu_unlink_tb(CPUState *env)
#ifndef CONFIG_USER_ONLY
/* mask must never be zero, except for A20 change call */
-void cpu_interrupt(CPUState *env, int mask)
+static void tcg_handle_interrupt(CPUState *env, int mask)
{
int old_mask;
@@ -1658,6 +1658,8 @@ void cpu_interrupt(CPUState *env, int mask)
}
}
+CPUInterruptHandler cpu_interrupt_handler = tcg_handle_interrupt;
+
#else /* CONFIG_USER_ONLY */
void cpu_interrupt(CPUState *env, int mask)
--
1.7.4.4
- [Qemu-devel] [PATCH 0/9] [PULL] qemu-kvm.git uq/master queue, Marcelo Tosatti, 2011/05/02
- [Qemu-devel] [PATCH 9/9] kvm: use qemu_free consistently, Marcelo Tosatti, 2011/05/02
- [Qemu-devel] [PATCH 1/9] kvm: use kernel-provided para_features instead of statically coming up with new capabilities, Marcelo Tosatti, 2011/05/02
- [Qemu-devel] [PATCH 3/9] kvm: add kvmclock to its second bit, Marcelo Tosatti, 2011/05/02
- [Qemu-devel] [PATCH 7/9] kvm: Install specialized interrupt handler, Marcelo Tosatti, 2011/05/02
- [Qemu-devel] [PATCH 8/9] fix crash in migration, 32-bit userspace on 64-bit host, Marcelo Tosatti, 2011/05/02
- [Qemu-devel] [PATCH 2/9] x86: Allow multiple cpu feature matches of lookup_feature, Marcelo Tosatti, 2011/05/02
- [Qemu-devel] [PATCH 6/9] Redirect cpu_interrupt to callback handler,
Marcelo Tosatti <=
- [Qemu-devel] [PATCH 4/9] kvm: create kvmclock when one of the flags are present, Marcelo Tosatti, 2011/05/02
- [Qemu-devel] [PATCH 5/9] Break up user and system cpu_interrupt implementations, Marcelo Tosatti, 2011/05/02
- Re: [Qemu-devel] [PATCH 0/9] [PULL] qemu-kvm.git uq/master queue, Anthony Liguori, 2011/05/02