From patchwork Thu Oct 10 11:33:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Hildenbrand X-Patchwork-Id: 175772 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp2181365ill; Thu, 10 Oct 2019 05:00:07 -0700 (PDT) X-Google-Smtp-Source: APXvYqxHZKRx0dNShu/X0Nekue29tyySZ2n6yb15ZKUN7yoxwCqn+SRjwAi4q1U14pxC8Chc/G5k X-Received: by 2002:a05:620a:1469:: with SMTP id j9mr9131407qkl.398.1570708807576; Thu, 10 Oct 2019 05:00:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570708807; cv=none; d=google.com; s=arc-20160816; b=fZon/OIp/7Swt8ZARdKtpzDePH0aSrJxEEU5TBFom9B4sA7eN5OakpftSODUwzNq5c dFOwWzeW9muY2UCm1YwWhBDxlGYDRHmPfLguHXERkAmfxAFHRcrBWfND14Ko+iYq4gXn oz/mukqLP0pRiVlZTOdtatpzXQj5Igu/qbm80YI3PhcsD6t4o2IRc3DQ5KnS1msEzmhs I51KI/RZumHWDaUygfAoFFwUoy7u7sNZYmCppgqk7s90I0CVFdnXU9+67E+FUH/38lR7 ZXD+t/HcQ0vE8wclGhF0vZUBkFCpH9STFPYMKUWPRxzzfz3V/4YbI0AaYoTOB2E1dnu0 W99Q== 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=n9nK2fR6klalLg2w93/xwMz8kKQIkVfpoaS7JucibHk=; b=NJLuD1J0yG1EmsFts7dC8RxD8WS/k3EnLoWj9qAuY1mc5PEp4GfhyGn3dFbM//Db4Y KUYgYsMwIjgLYlWMIvUFcba2V1FyvkCRsKBJ8bL8DH/9c57xJMHSHVzD0vRmAldo8siy a1k5N6mnmO6jna7acPl11TrMNGUAkDFC6+g3O8LxwDOpGQ69W4gZ8fDqbIjpK4z3uUDM tlSbIlB1b1SJZ+PUxkz6Wi1felkE9A/GWTcRQN/86gmmcZCOEcH28irf2Gxspvip8DSo S2r0xLd4svEn9N/PSd7HsmUKSNXiP7dCtC8FYYqJN0A+F7UDsXC6oeIoKGdohxMQZkIr Qyqw== 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 g186si5779807qkd.102.2019.10.10.05.00.07 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Oct 2019 05:00:07 -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]:36832 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIX70-0007YI-Kr for patch@linaro.org; Thu, 10 Oct 2019 08:00:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50768) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iIWkY-0006jk-N8 for qemu-devel@nongnu.org; Thu, 10 Oct 2019 07:36:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iIWkW-0006dI-Jw for qemu-devel@nongnu.org; Thu, 10 Oct 2019 07:36:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45262) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iIWkW-0006cu-E9; Thu, 10 Oct 2019 07:36:52 -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 A1DC4883C24; Thu, 10 Oct 2019 11:36:51 +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 2C32A5C1B5; Thu, 10 Oct 2019 11:36:50 +0000 (UTC) From: David Hildenbrand To: Peter Maydell , qemu-devel@nongnu.org Subject: [PULL 28/31] target/s390x: Remove ilen argument from trigger_access_exception Date: Thu, 10 Oct 2019 13:33:53 +0200 Message-Id: <20191010113356.5017-29-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.6.2 (mx1.redhat.com [10.5.110.69]); Thu, 10 Oct 2019 11:36:51 +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 The single caller passes ILEN_UNWIND; pass that along to trigger_pgm_exception directly. Reviewed-by: David Hildenbrand Signed-off-by: Richard Henderson Message-Id: <20191001171614.8405-17-richard.henderson@linaro.org> Signed-off-by: David Hildenbrand --- target/s390x/mmu_helper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.21.0 diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c index df58fb73ba..09c74f17dd 100644 --- a/target/s390x/mmu_helper.c +++ b/target/s390x/mmu_helper.c @@ -33,7 +33,7 @@ #define FS_WRITE 0x400 static void trigger_access_exception(CPUS390XState *env, uint32_t type, - uint32_t ilen, uint64_t tec) + uint64_t tec) { S390CPU *cpu = env_archcpu(env); @@ -44,7 +44,7 @@ static void trigger_access_exception(CPUS390XState *env, uint32_t type, if (type != PGM_ADDRESSING) { stq_phys(cs->as, env->psa + offsetof(LowCore, trans_exc_code), tec); } - trigger_pgm_exception(env, type, ilen); + trigger_pgm_exception(env, type, ILEN_UNWIND); } } @@ -510,7 +510,7 @@ int s390_cpu_virt_mem_rw(S390CPU *cpu, vaddr laddr, uint8_t ar, void *hostbuf, ret = translate_pages(cpu, laddr, nr_pages, pages, is_write, &tec); if (ret) { - trigger_access_exception(&cpu->env, ret, ILEN_UNWIND, tec); + trigger_access_exception(&cpu->env, ret, tec); } else if (hostbuf != NULL) { /* Copy data by stepping through the area page by page */ for (i = 0; i < nr_pages; i++) {