From patchwork Mon Dec 16 14:12:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hogan X-Patchwork-Id: 301725 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5A4FD2C009F for ; Tue, 17 Dec 2013 01:15:35 +1100 (EST) Received: from localhost ([::1]:56329 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VsYxI-000848-Af for incoming@patchwork.ozlabs.org; Mon, 16 Dec 2013 09:15:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43214) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VsYwd-00081z-Lm for qemu-devel@nongnu.org; Mon, 16 Dec 2013 09:14:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VsYwY-0003B6-P5 for qemu-devel@nongnu.org; Mon, 16 Dec 2013 09:14:51 -0500 Received: from multi.imgtec.com ([194.200.65.239]:37103) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VsYwY-00039u-K6 for qemu-devel@nongnu.org; Mon, 16 Dec 2013 09:14:46 -0500 From: James Hogan To: Date: Mon, 16 Dec 2013 14:12:43 +0000 Message-ID: <1387203165-5553-9-git-send-email-james.hogan@imgtec.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1387203165-5553-1-git-send-email-james.hogan@imgtec.com> References: <1387203165-5553-1-git-send-email-james.hogan@imgtec.com> MIME-Version: 1.0 X-Originating-IP: [192.168.154.65] X-SEF-Processed: 7_3_0_01192__2013_12_16_14_14_43 X-detected-operating-system: by eggs.gnu.org: Windows XP X-Received-From: 194.200.65.239 Cc: James Hogan , kvm@vger.kernel.org, Gleb Natapov , Sanjay Lal , Paolo Bonzini , Aurelien Jarno Subject: [Qemu-devel] [PATCH v2 08/10] hw/mips: In KVM mode, inject IRQ2 (I/O) interupts via ioctls X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Sanjay Lal COP0 emulation is in-kernel for KVM, so inject IRQ2 (I/O) interrupts via ioctls. Signed-off-by: Sanjay Lal Signed-off-by: James Hogan Cc: Aurelien Jarno Reviewed-by: Aurelien Jarno --- 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) {