From patchwork Tue Mar 15 11:26:15 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Jan Kiszka <jan.kiszka@siemens.com>
X-Patchwork-Id: 635791
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2FBQqkB017781
	for <patchwork-kvm@patchwork.kernel.org>;
	Tue, 15 Mar 2011 11:26:53 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1757275Ab1COL0r (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Tue, 15 Mar 2011 07:26:47 -0400
Received: from david.siemens.de ([192.35.17.14]:26551 "EHLO david.siemens.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753099Ab1COL0r (ORCPT <rfc822;kvm@vger.kernel.org>);
	Tue, 15 Mar 2011 07:26:47 -0400
Received: from mail1.siemens.de (localhost [127.0.0.1])
	by david.siemens.de (8.13.6/8.13.6) with ESMTP id p2FBQYFR010875;
	Tue, 15 Mar 2011 12:26:35 +0100
Received: from mchn199C.mchp.siemens.de ([146.254.215.103])
	by mail1.siemens.de (8.13.6/8.13.6) with ESMTP id p2FBQVfw000888;
	Tue, 15 Mar 2011 12:26:34 +0100
From: Jan Kiszka <jan.kiszka@siemens.com>
To: Avi Kivity <avi@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>
Cc: kvm@vger.kernel.org, qemu-devel@nongnu.org,
	Riku Voipio <riku.voipio@iki.fi>
Subject: [PATCH v2 04/20] Break up user and system cpu_interrupt
	implementations
Date: Tue, 15 Mar 2011 12:26:15 +0100
Message-Id: 
 <2d5dce7bfea659d875323b90a91567d30d2be4b6.1300188374.git.jan.kiszka@siemens.com>
X-Mailer: git-send-email 1.7.1
In-Reply-To: <cover.1300188374.git.jan.kiszka@siemens.com>
References: <cover.1300188374.git.jan.kiszka@siemens.com>
In-Reply-To: <cover.1300188374.git.jan.kiszka@siemens.com>
References: <cover.1300188374.git.jan.kiszka@siemens.com>
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Tue, 15 Mar 2011 11:26:53 +0000 (UTC)


diff --git a/exec.c b/exec.c
index c5358c3..12ea582 100644
--- a/exec.c
+++ b/exec.c
@@ -1627,6 +1627,7 @@ static void cpu_unlink_tb(CPUState *env)
     spin_unlock(&interrupt_lock);
 }
 
+#ifndef CONFIG_USER_ONLY
 /* mask must never be zero, except for A20 change call */
 void cpu_interrupt(CPUState *env, int mask)
 {
@@ -1635,7 +1636,6 @@ void cpu_interrupt(CPUState *env, int mask)
     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.
@@ -1644,21 +1644,27 @@ void cpu_interrupt(CPUState *env, int mask)
         qemu_cpu_kick(env);
         return;
     }
-#endif
 
     if (use_icount) {
         env->icount_decr.u16.high = 0xffff;
-#ifndef CONFIG_USER_ONLY
         if (!can_do_io(env)
             && (mask & ~old_mask) != 0) {
             cpu_abort(env, "Raised interrupt while not in I/O function");
         }
-#endif
     } else {
         cpu_unlink_tb(env);
     }
 }
 
+#else /* CONFIG_USER_ONLY */
+
+void cpu_interrupt(CPUState *env, int mask)
+{
+    env->interrupt_request |= mask;
+    cpu_unlink_tb(env);
+}
+#endif /* CONFIG_USER_ONLY */
+
 void cpu_reset_interrupt(CPUState *env, int mask)
 {
     env->interrupt_request &= ~mask;