From patchwork Tue May 14 15:52:58 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: 164222 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp2800184ili; Tue, 14 May 2019 09:01:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqwduK1nrIlJT3TAQOgtCFEWCx6E/5m70kvQwM8WzThFJd+Cr9b027Sk0EStH+nl5mCZBRB1 X-Received: by 2002:adf:f74f:: with SMTP id z15mr21540435wrp.282.1557849681619; Tue, 14 May 2019 09:01:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557849681; cv=none; d=google.com; s=arc-20160816; b=Cy4cWlBIyikz23WknxGFbm5G6mAyqNwiXigRzdhkB73CDBKF3HdLIHuOSs34zhVe3u HjkIzQ9i5D2jiT1g2uZuvMXMtYMStUlWOAGne1fExbhDyZoXtU+dqktMkDdnHe2TJfjD Zq/IG3/Nnmf3XyJiYEvtyb6yWO58iTndE9FIclqIP4K9jlOrKHCDYoBCxnF1CojAX9JK 5GPh8WMhgnTYPv7FtxfEa/ZUIs1FhINBb1sQfi2C803aWrLl8+TUyh149njwxK21gQ02 IqCivWublx4JPcJtlo+WwcYkTdJp+GRO8NX/S8yib7bbUxPgX4lKyW+TuE2gW34wVl5K JX/Q== 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=l/EZtOIUyXPpqgCV5lyhmXRqV1pA86ugcjhdZROi1Z8=; b=eLhB8CCgkc3KreTVzRerbhstj9u2y7B/lO1gePveQs3WE7IQJAVOgr0QqS7tGoaQD/ tFJipkcCOc1ecYcvoqpDLWc5APWVvVToLizLJaP6Y135rMcjscttJoOzKYGLZs3yxaiS VdgWa29qNR8XKrGIKjpGYpN43N6rsgmfeFLjKbu95C+nk6rJ/qCLaX+VJmI9MxYB6AOc 0zQE0zUTXHN6rLpbw3PRd3mVCaB+QOUi2q2fDmOo/TxTMWUKGSh69AZhCd3sioEz4eoX d/3kfN3x2OECi/kl8nkWIR9DMnRWPHDUx+45Hm1go38xGUb9vHmWgNe2dCAdaQ2GNU3B PG0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=WkCkO8qK; 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 j23si8115468eda.335.2019.05.14.09.01.21 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 14 May 2019 09:01:21 -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=WkCkO8qK; 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]:50330 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQZrk-0003Y4-Ga for patch@linaro.org; Tue, 14 May 2019 12:01:20 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60472) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hQZjr-0004oK-EU for qemu-devel@nongnu.org; Tue, 14 May 2019 11:53:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hQZjp-0006KO-V5 for qemu-devel@nongnu.org; Tue, 14 May 2019 11:53:11 -0400 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:53175) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hQZjp-0006Go-MJ for qemu-devel@nongnu.org; Tue, 14 May 2019 11:53:09 -0400 Received: by mail-wm1-x341.google.com with SMTP id y3so3436936wmm.2 for ; Tue, 14 May 2019 08:53:09 -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=l/EZtOIUyXPpqgCV5lyhmXRqV1pA86ugcjhdZROi1Z8=; b=WkCkO8qKAZ0uLl0RhQASW3MB8JEW4RRqIqUsDKImnpMMIk29f3qEKUNrTYkEBZYmHr D32fT3MeKJhYM3X/GpeYf7M7p1k8CWXMIABmmZdmF3iJ35J7/edececFU7SI4PeudjoA TrtGcLb0JoqELZpEufqX8t/2mT0UzICJSO7H8Dh5CBI15Mp25cwlpSzKT2Cz4SCCZhTh XFSPpqxgdN8nmOcLJnNLV+CkAgMefNvPu7IXRgU3RbTKkdv04HgR2HqhWLysnj+yul1w ekf+F/aVMendG+tYDh0cnAtNg+AapBLAgNBnXlnalZicvcwVP3Nr2WP/WkxRooI1Awko 5PYw== 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=l/EZtOIUyXPpqgCV5lyhmXRqV1pA86ugcjhdZROi1Z8=; b=Awt+lXwJc4cCIPVOuuvtXkkbJQd0U/CvKcuUbspuCBiraokxWDaCbeIlMJPPZz1b/X VfzhbyUBHU+PRYvhwhhnTy7yX4HNdWHY+T+usxF+cW27VSNPD/tlyIngheSls+6k+FSK IeF5DGVc0V4bBgP3panM1qWb6L0UI6GTPL/jF+j7dXk1NPYZ4OaqA8oQjDwIWOzHGK2+ L7PTZ9pz09UJEEMWqeAXoBIaZ8AH7iKzHTbRVsJXeCV7BH4NxNEaiWxyMhR7d60+e5US NCq7K+qf1K1PcCwuyvr188eTI4eGvObI5SHslvuqxyi/N+3aBt4bBFEnZR26h9Z3xis0 OHeQ== X-Gm-Message-State: APjAAAVD7bqgwExjqZSvJV+dkw3FCenjDoXWPqCl43wVcT4fF7udqEaK cMWvICnLJYVV/4NzeErypuftdQ== X-Received: by 2002:a1c:9c03:: with SMTP id f3mr20577817wme.67.1557849188513; Tue, 14 May 2019 08:53:08 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 15sm3580767wmg.36.2019.05.14.08.53.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 May 2019 08:53:05 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B877F1FF98; Tue, 14 May 2019 16:53:02 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 14 May 2019 16:52:58 +0100 Message-Id: <20190514155301.16123-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190514155301.16123-1-alex.bennee@linaro.org> References: <20190514155301.16123-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::341 Subject: [Qemu-devel] [RFC PATCH 08/11] 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: Peter Maydell , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= 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 --- target/arm/arm-semi.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé 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: