From patchwork Thu May 23 10:25:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 164958 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp1990814ili; Thu, 23 May 2019 03:32:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqxPONTcPFuDVoP+c/EzGXku3QPwVLfhiPsp6s7dqw7fadJWWFMPO7cP98ZFlLPeA3LGvFX7 X-Received: by 2002:a17:906:1514:: with SMTP id b20mr45324207ejd.174.1558607540930; Thu, 23 May 2019 03:32:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558607540; cv=none; d=google.com; s=arc-20160816; b=tSRS3ZBfQw9p55KhqdnNfIOagpxj/WSnuNU1VYkg7Sge07WvahQ29Lk2vlF2b5E0CX vJcXW9efcP2ZgTQZT52VYHXQK5jw/kVtPojuTYZ+XcjKR8A5S40drz/W8+198M6/q7LO jBcVJqTWM9C5PHGIC3qAsyAH9LjZUarl4ptJPLof1DeHlcIZ1CSmr31jiFP98pVci2u7 awMxjvvyUceMqz9xsQx9Nx4NMlijlN6kNSbhhbtPjP1QUCr0jknoA2GM+2J28ugCgRML aOWm2sOd5OBYcEa5Zu4yKMaUWVWNk1iRXZLMJAeY1dwcZv6MfqCbHIOaMt1GQy6frSAx UWmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=gOs6U+dajCIf3344cfmtEQwYTSo5fWlyTxBlW4SM4Qo=; b=XMYM1Cp27OZBc0Gcq38WiZlmckTg1kOwlJXX0jIr/iTY9mbwSKNWqJzUbBMmxGIK+T vH+YKPZxyJew0xnu2os1PH9N+w4HhuoTpV1PtpKtnIu+0DXRd0SdMeGsoIhRJbiGDbfF jR33/r/xOMlQoguNSiKjOtfOzzeSeXpo3TGvpfpY5/rQZEg7y2oRkN6qzA8rlnqprqYF JUOJ0uPYcZZXRKj9DeLCe3yZs5qsz6FWqhRD9iznJP2ScQ1e9wJ8U4Za41bP98n0eDx7 Bb1lRlBRt5cJymlBPBQl7qHJUK6Vkvi9uHqs5xBaxbDE8Ei9dzi4yEqXK3ja3R7Z9uBA GojQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Ua91iBkf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v20si20292278edc.102.2019.05.23.03.32.19 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 23 May 2019 03:32:20 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Ua91iBkf; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:33152 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTl1G-0002yI-QB for patch@linaro.org; Thu, 23 May 2019 06:32:18 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49219) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTkv4-0005YP-7L for qemu-devel@nongnu.org; Thu, 23 May 2019 06:25:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTkv0-00018Z-E5 for qemu-devel@nongnu.org; Thu, 23 May 2019 06:25:52 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:38081) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hTkv0-0000vi-54 for qemu-devel@nongnu.org; Thu, 23 May 2019 06:25:50 -0400 Received: by mail-wm1-x344.google.com with SMTP id t5so5201080wmh.3 for ; Thu, 23 May 2019 03:25:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gOs6U+dajCIf3344cfmtEQwYTSo5fWlyTxBlW4SM4Qo=; b=Ua91iBkfhzDSZQQT09/eD2aY088HPqcnVLS2CalLdrbg+I7Wm6cAzwk0yOoAZw/XTp ji+ZVfSeo/LwsbeAM4XF1xGY8HEA/bBUXziozpCdlhdKmIiItoW+vNH9vc1Q7Yfq1rKJ ok6Fk0m5LNwAwqlaXPb8xv8ahFi79rfgzXbsXE9DVUVgJkiGaimSPovZshbkata4oOUo 8QIPfbxrmUtU3YOe6WCbxw/4KwEeUe8w00m1oFHnnz4J7sOHypPielcFDgunnnCZsoaS FqYxoUlgsRnk/8Av6mB0hb2xbTehlxpmWZS9ObRdS4s1XnGppBTnpSHZLrlLrQupqULu GE/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gOs6U+dajCIf3344cfmtEQwYTSo5fWlyTxBlW4SM4Qo=; b=f7U80Ady3KLzVh8ARMAx0lOAcCp4TKqBe4uqevIaKS8Dl+fNv18J+/wMYWtPJXtcHJ kGCjb1xpec+2EUgmXh6CMfRBzE6TT2zJbKWNbhefAdPR9Zf0XofAzqTP9mRqDLhvJjdw H23rMD1nB8XS7xpOjaykHBXXf2EFBfTvy4L63rXfPq0xg69tf8e154GMOsh8UyS0J6Zx gdTYV6i0YG8YfoKimDIV/HPDHE2ohQEQD/Q6BN59nvBeceCpeG9Ud7YgHA2GolFHi7Ly AT8BqkE6jg8qoof2gbuu3GVqDJdkIq5XO/U/sC+XM43SSs6iufawVHtPeJ744QfRxG6a k4zA== X-Gm-Message-State: APjAAAVZ2yX0P0pWxdRyhkm0fibA5E2iEMdZpzneRGcI2f7issOhRxoO oMbFewS/C8WswQNwpSjTLoG02Q== X-Received: by 2002:a1c:c706:: with SMTP id x6mr5246214wmf.35.1558607138901; Thu, 23 May 2019 03:25:38 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 24sm7218895wmo.3.2019.05.23.03.25.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 23 May 2019 03:25:35 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 340541FF87; Thu, 23 May 2019 11:25:33 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 23 May 2019 11:25:12 +0100 Message-Id: <20190523102532.10486-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190523102532.10486-1-alex.bennee@linaro.org> References: <20190523102532.10486-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH v2 08/28] target/arm: correct return values for WRITE/READ in arm-semi X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Peter Maydell Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The documentation says the write should return the number of bytes not written on an error (0 means everything was written). Read provides a buffer length and the return value should be the buffer length - bytes actually read. Remove the incorrect FIXME's and return the correct values. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé --- target/arm/arm-semi.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) -- 2.20.1 diff --git a/target/arm/arm-semi.c b/target/arm/arm-semi.c index a3bbef18ef7..3ae8f05d51b 100644 --- a/target/arm/arm-semi.c +++ b/target/arm/arm-semi.c @@ -334,13 +334,15 @@ target_ulong do_arm_semihosting(CPUARMState *env) } else { s = lock_user(VERIFY_READ, arg1, len, 1); if (!s) { - /* FIXME - should this error code be -TARGET_EFAULT ? */ - return (uint32_t)-1; + /* Return bytes not written on error */ + return len; } ret = set_swi_errno(ts, write(arg0, s, len)); unlock_user(s, arg1, 0); - if (ret == (uint32_t)-1) - return -1; + if (ret == (uint32_t)-1) { + ret = 0; + } + /* Return bytes not written */ return len - ret; } case TARGET_SYS_READ: @@ -355,15 +357,17 @@ target_ulong do_arm_semihosting(CPUARMState *env) } else { s = lock_user(VERIFY_WRITE, arg1, len, 0); if (!s) { - /* FIXME - should this error code be -TARGET_EFAULT ? */ - return (uint32_t)-1; + /* return bytes not read */ + return len; } do { ret = set_swi_errno(ts, read(arg0, s, len)); } while (ret == -1 && errno == EINTR); unlock_user(s, arg1, len); - if (ret == (uint32_t)-1) - return -1; + if (ret == (uint32_t)-1) { + ret = 0; + } + /* Return bytes not read */ return len - ret; } case TARGET_SYS_READC: