From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LBBC4-0006sQ-Kx for qemu-devel@nongnu.org; Fri, 12 Dec 2008 11:48:48 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LBBC3-0006r7-4A for qemu-devel@nongnu.org; Fri, 12 Dec 2008 11:48:48 -0500 Received: from [199.232.76.173] (port=33443 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LBBC2-0006r1-IT for qemu-devel@nongnu.org; Fri, 12 Dec 2008 11:48:46 -0500 Received: from ns.suse.de ([195.135.220.2]:52151 helo=mx1.suse.de) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LBBC2-000649-4k for qemu-devel@nongnu.org; Fri, 12 Dec 2008 11:48:46 -0500 From: Alexander Graf Date: Fri, 12 Dec 2008 17:48:41 +0100 Message-Id: <1229100521-12665-1-git-send-email-agraf@suse.de> Subject: [Qemu-devel] [PATCH] SVM: acknowledge interrupt only after it is taken Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org SVM specifies that the V_IRQ mask is only to be removed, if the interrupt that is to be delivered actually is delivered. As of the SVM rewrite, this mask is always unmasked when the main cpu loop is processed, leaving a corner case where calling the interrupt handler causes a #PF. In that case (booting Linux / starting gfxboot) the current implementation tells the VMM the interrupt is taken, even though it is not. This patch modifies the VIRQ unmasking to occur after do_interrupt, making gfxboot work again. --- cpu-exec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cpu-exec.c b/cpu-exec.c index 9a35a59..981ba86 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -401,11 +401,11 @@ int cpu_exec(CPUState *env1) int intno; /* FIXME: this should respect TPR */ svm_check_intercept(SVM_EXIT_VINTR); - env->interrupt_request &= ~CPU_INTERRUPT_VIRQ; intno = ldl_phys(env->vm_vmcb + offsetof(struct vmcb, control.int_vector)); if (loglevel & CPU_LOG_TB_IN_ASM) fprintf(logfile, "Servicing virtual hardware INT=0x%02x\n", intno); do_interrupt(intno, 0, 0, 0, 1); + env->interrupt_request &= ~CPU_INTERRUPT_VIRQ; next_tb = 0; #endif } -- 1.5.6