From patchwork Thu Oct 10 11:33:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 175768 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp2174985ill; Thu, 10 Oct 2019 04:53:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqxh4YE8WpFKRmmXXcbeaVhnisR+6rV1rNfmOXuOkkL5f6utO83qUj7zZb0uBqRPeFTaNzdQ X-Received: by 2002:a50:fa94:: with SMTP id w20mr7837223edr.47.1570708418934; Thu, 10 Oct 2019 04:53:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570708418; cv=none; d=google.com; s=arc-20160816; b=AZf8+Pni9qek94MaUp7a5iztFnnNwkjyVyxyT6usk5KYeY4V/G4phOkgc8e0k3MfTx 2d40D2inovBlsnBpcbuvUw4iHeAx9ZtdJ5adF2WNnk8NHQRTGJOPuOn/rDVPwFkdD3B1 Q68jRu7zBmhb9ativw7scuBGrXK+0DJyGqZTR617TAxH/D5hTEiCqkrgN1MLMmSHrLc/ EdFiWEX+BMvlejOj8epZHI9oGoh3IOu9gpgeFC4GaYxP4XTxW5d/H+6bi32qqOd/CgKF 1YXYofaBYUCcqYc8BsnO+0ekyY/6ENx92b1dybRKOFE6PN8Lg9/wynEBnyeJMMr5Sz1d gW/w== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from; bh=t22bHl9JWyLjic1qDlrEugIMAUxqK+RYVjkEzQ0D8K4=; b=Izn5G4E6w6Wmm40HRB7OnzTLq92ApMdmq07KXtya0EqQlHluH1sedax2Fk5mUtNyHM EsRiEnbWuyERrvExiSV/BAF4xsqP1OQGaWbTXx6uWK7U4vYO6k8Pfaq/oeyq+RWRRKO+ hCw0iEjBNQs87GfUSHRkbbzLwjkAsBySBoxMZvjiyRlx/icUACj+Zko2HsBnQ3XrrtvL wGFUC7q9EJ69kNa6MUdXDIAEJ4XaNVz5437TaE2rsZAGhjDSRH3G+qIq25azUgsO5Nx3 GFaCCnHeChJu/bMNTfqT9O/79bN383E36mX1Lyb4UvvzbfY8BlkA1coqsV3/sATH4M1C IvYg== ARC-Authentication-Results: i=1; mx.google.com; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id r24si3046991ejs.166.2019.10.10.04.53.38 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Oct 2019 04:53:38 -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; 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=redhat.com Received: from localhost ([::1]:36756 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIX0j-0000Ni-GT for patch@linaro.org; Thu, 10 Oct 2019 07:53:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50506) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIWjH-0004bE-Ue for qemu-devel@nongnu.org; Thu, 10 Oct 2019 07:35:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIWjG-0006IE-Sq for qemu-devel@nongnu.org; Thu, 10 Oct 2019 07:35:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46086) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIWjG-0006Hj-NL; Thu, 10 Oct 2019 07:35:34 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 989132D6A10; Thu, 10 Oct 2019 11:35:32 +0000 (UTC) Received: from t460s.redhat.com (ovpn-117-138.ams2.redhat.com [10.36.117.138]) by smtp.corp.redhat.com (Postfix) with ESMTP id EF79F5C548; Thu, 10 Oct 2019 11:35:19 +0000 (UTC) From: David Hildenbrand To: Peter Maydell , qemu-devel@nongnu.org Subject: [PULL 20/31] target/s390x: Remove exc argument to mmu_translate_asce Date: Thu, 10 Oct 2019 13:33:45 +0200 Message-Id: <20191010113356.5017-21-david@redhat.com> In-Reply-To: <20191010113356.5017-1-david@redhat.com> References: <20191010113356.5017-1-david@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 10 Oct 2019 11:35:32 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-s390x@nongnu.org, Cornelia Huck , Richard Henderson , Thomas Huth , David Hildenbrand Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson Now that mmu_translate_asce returns the exception instead of raising it, the argument is unused. Reviewed-by: David Hildenbrand Signed-off-by: Richard Henderson Message-Id: <20191001171614.8405-9-richard.henderson@linaro.org> Signed-off-by: David Hildenbrand --- target/s390x/mmu_helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.21.0 diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c index e8281d4413..e57d762f45 100644 --- a/target/s390x/mmu_helper.c +++ b/target/s390x/mmu_helper.c @@ -116,7 +116,7 @@ static inline bool read_table_entry(CPUS390XState *env, hwaddr gaddr, static int mmu_translate_asce(CPUS390XState *env, target_ulong vaddr, uint64_t asc, uint64_t asce, target_ulong *raddr, - int *flags, int rw, bool exc) + int *flags, int rw) { const bool edat1 = (env->cregs[0] & CR0_EDAT) && s390_has_feat(S390_FEAT_EDAT); @@ -423,7 +423,7 @@ int mmu_translate(CPUS390XState *env, target_ulong vaddr, int rw, uint64_t asc, } /* perform the DAT translation */ - r = mmu_translate_asce(env, vaddr, asc, asce, raddr, flags, rw, exc); + r = mmu_translate_asce(env, vaddr, asc, asce, raddr, flags, rw); if (unlikely(r)) { if (exc) { trigger_access_exception(env, r, ilen, tec);