On Mon, Dec 16, 2013 at 02:12:43PM +0000, James Hogan wrote:
> From: Sanjay Lal <sanjayl@xxxxxxxxxxx>
>
> COP0 emulation is in-kernel for KVM, so inject IRQ2 (I/O) interrupts via
> ioctls.
>
> Signed-off-by: Sanjay Lal <sanjayl@xxxxxxxxxxx>
> Signed-off-by: James Hogan <james.hogan@xxxxxxxxxx>
> Cc: Aurelien Jarno <aurelien@xxxxxxxxxxx>
> ---
> Changes in v2:
> - Expand commit message
> - Remove #ifdef CONFIG_KVM since it's guarded by kvm_enabled() already
> ---
> hw/mips/mips_int.c | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/hw/mips/mips_int.c b/hw/mips/mips_int.c
> index 7dbd24d..1b9981e 100644
> --- a/hw/mips/mips_int.c
> +++ b/hw/mips/mips_int.c
> @@ -23,6 +23,8 @@
> #include "hw/hw.h"
> #include "hw/mips/cpudevs.h"
> #include "cpu.h"
> +#include "sysemu/kvm.h"
> +#include "kvm_mips.h"
>
> static void cpu_mips_irq_request(void *opaque, int irq, int level)
> {
> @@ -35,8 +37,17 @@ static void cpu_mips_irq_request(void *opaque, int irq, int level)
>
> if (level) {
> env->CP0_Cause |= 1 << (irq + CP0Ca_IP);
> +
> + if (kvm_enabled() && irq == 2) {
> + kvm_mips_set_interrupt(env, irq, level);
> + }
> +
> } else {
> env->CP0_Cause &= ~(1 << (irq + CP0Ca_IP));
> +
> + if (kvm_enabled() && irq == 2) {
> + kvm_mips_set_interrupt(env, irq, level);
> + }
> }
>
> if (env->CP0_Cause & CP0Ca_IP_mask) {
Reviewed-by: Aurelien Jarno <aurelien@xxxxxxxxxxx>
--
Aurelien Jarno GPG: 1024D/F1BCDB73
aurelien@xxxxxxxxxxx http://www.aurel32.net
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
