From patchwork Fri Oct 12 18:24:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 191174 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8F4BD2C0083 for ; Sat, 13 Oct 2012 05:32:38 +1100 (EST) Received: from localhost ([::1]:49225 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TMjvL-0004Is-1P for incoming@patchwork.ozlabs.org; Fri, 12 Oct 2012 14:25:27 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51028) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TMjug-0002lx-JZ for qemu-devel@nongnu.org; Fri, 12 Oct 2012 14:24:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TMjue-0006LC-QZ for qemu-devel@nongnu.org; Fri, 12 Oct 2012 14:24:46 -0400 Received: from afflict.kos.to ([92.243.29.197]:33085) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TMjue-0006KW-IP for qemu-devel@nongnu.org; Fri, 12 Oct 2012 14:24:44 -0400 Received: by afflict.kos.to (Postfix, from userid 1000) id 61EE2264C5; Fri, 12 Oct 2012 20:24:42 +0200 (CEST) From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Fri, 12 Oct 2012 21:24:39 +0300 Message-Id: <8268db7babe40fe26ffcd14ed5fb5dd44848ccb3.1350063473.git.riku.voipio@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 92.243.29.197 Cc: Riku Voipio Subject: [Qemu-devel] [PATCH 2/5] linux-user: move read to own function 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: Riku Voipio In preparations for for refactoring the main switch/case out Signed-off-by: Riku Voipio --- linux-user/syscall.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 0b077e7..497cae5 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -5131,6 +5131,21 @@ static void do_exit(void *cpu_env, abi_long arg1) _exit(arg1); } +static abi_long do_read(abi_long arg1, abi_long arg2, abi_long arg3) +{ + abi_long ret; + void *p; + if (arg3 == 0) + ret = 0; + else { + if (!(p = lock_user(VERIFY_WRITE, arg2, arg3, 0))) + return -EFAULT; + ret = read(arg1, p, arg3); + unlock_user(p, arg2, ret); + } + return ret; +} + /* do_syscall() should always have a single exit point at the end so that actions, such as logging of syscall results, can be performed. All errnos that do_syscall() returns must be -TARGET_. */ @@ -5155,14 +5170,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, do_exit(cpu_env, arg1); break; case TARGET_NR_read: - if (arg3 == 0) - ret = 0; - else { - if (!(p = lock_user(VERIFY_WRITE, arg2, arg3, 0))) - goto efault; - ret = get_errno(read(arg1, p, arg3)); - unlock_user(p, arg2, ret); - } + ret = get_errno(do_read(arg1, arg2, arg3)); break; case TARGET_NR_write: if (!(p = lock_user(VERIFY_READ, arg2, arg3, 1)))