From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LMUPV-0001Ot-3F
	for qemu-devel@nongnu.org; Mon, 12 Jan 2009 16:33:25 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LMUPU-0001O6-FP
	for qemu-devel@nongnu.org; Mon, 12 Jan 2009 16:33:24 -0500
Received: from [199.232.76.173] (port=55475 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LMUPU-0001Nm-8j
	for qemu-devel@nongnu.org; Mon, 12 Jan 2009 16:33:24 -0500
Received: from savannah.gnu.org ([199.232.41.3]:47936 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@beuc.net>)
	id 1LMUPT-0002vc-WD
	for qemu-devel@nongnu.org; Mon, 12 Jan 2009 16:33:24 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@beuc.net>) id 1LMUPT-0003Er-IX
	for qemu-devel@nongnu.org; Mon, 12 Jan 2009 21:33:23 +0000
Received: from aurel32 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <aurel32@savannah.gnu.org>) id 1LMUPT-0003El-7Y
	for qemu-devel@nongnu.org; Mon, 12 Jan 2009 21:33:23 +0000
MIME-Version: 1.0
Errors-To: aurel32
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Aurelien Jarno <aurelien@aurel32.net>
Message-Id: <E1LMUPT-0003El-7Y@cvs.savannah.gnu.org>
Date: Mon, 12 Jan 2009 21:33:23 +0000
Subject: [Qemu-devel] [6277] target-alpha: get rid of tests on
	env->user_mode_only
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 6277
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6277
Author:   aurel32
Date:     2009-01-12 21:33:22 +0000 (Mon, 12 Jan 2009)

Log Message:
-----------
target-alpha: get rid of tests on env->user_mode_only

Replace runtime checks on env->user_mode_only by compile time
checks on CONFIG_USER_ONLY.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

Modified Paths:
--------------
    trunk/hw/alpha_palcode.c

Modified: trunk/hw/alpha_palcode.c
===================================================================
--- trunk/hw/alpha_palcode.c	2009-01-12 21:33:13 UTC (rev 6276)
+++ trunk/hw/alpha_palcode.c	2009-01-12 21:33:22 UTC (rev 6277)
@@ -998,12 +998,12 @@
     uint64_t physical, page_size, end;
     int prot, zbits, ret;
 
-    if (env->user_mode_only) {
+#if defined(CONFIG_USER_ONLY)
         ret = 2;
-    } else {
+#else
         ret = virtual_to_physical(env, &physical, &zbits, &prot,
                                   address, mmu_idx, rw);
-    }
+#endif
     switch (ret) {
     case 0:
         /* No fault */