From patchwork Fri Sep 27 19:39:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 174658 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp3990835ill; Fri, 27 Sep 2019 13:04:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqzn87KWXqs3qIZm5Inm5yqUruO/2HAH+DcKjBK/WDpZMNkqCIDsWo5pXxeC/Of931BARsCp X-Received: by 2002:a37:27d0:: with SMTP id n199mr6467839qkn.313.1569614649442; Fri, 27 Sep 2019 13:04:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569614649; cv=none; d=google.com; s=arc-20160816; b=I1sOgSqMHc89KCVJOGNeeeQAqOawtMxQRZoMX7hfMbtMj5W8F3eiDsZ8HAJ3x1bm6K ulxGlTOwDa2EAJa5e+jgpJRdGG+dt1t4noIGae64BqZcOh7AkozIyCUVkDUwdJA2Nkta 2uvNyb/s3TWzw+bqg/5zMSMUNVhVaIk973e/89KDDH1ZAZAyW/CDYEmMRGWo1N46euMq Mmh4aLP8cgLK8geHkG/vlbV8qmX2sW+GTSw8wyp0EBXKjUwc26/l+4E2beXIzCv7up7w T92m7YiUyw4BuknOLkaVdOBMItgy++LCNNHT0wXLruizqCMvtnuKepR1/s66NDwoEV9E /Mpw== 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:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=rr9SwpjvJyE9OAuq+Q5fU6KQ8tvMfOw0yzqcdXmDV6g=; b=ivm41kJX83PdULWHygmh37gEY5yQgeXu63I4AoEYDNbybby1Tknkcx1HGrRLtDcBDn STiTTURa6KOgNrnswdkQcPuhQsYHqsmk4i3N4UEF8Cz18JR+9IFd/VoBMcowRm5g5XNq 7p2kgbt3ttFbOP6TZs/UCB7bz2JVHeyEyDaoVnabGfu7tPSI9qDVZYvbohklEG0fv4yf X5MotoWfyP6Vl6R3Ey72EVDLPaBrcqWT6psE/C2DIzWJS5bBsQd03FTxk7CYOSnGVDMT tnmtKNxS4tI7M+G5R2Z0w+wna5cRTeZ6H14/5L/Fm0FX8ixaS31D1QZl1dVzAOP/sivy MQ/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=aDT7Bxon; 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 f1si5486665qtm.155.2019.09.27.13.04.09 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Sep 2019 13:04:09 -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=aDT7Bxon; 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 ([::1]:57156 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDwTI-0002Pc-VS for patch@linaro.org; Fri, 27 Sep 2019 16:04:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46794) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDw5x-0003W9-W3 for qemu-devel@nongnu.org; Fri, 27 Sep 2019 15:40:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iDw5v-0006d8-MR for qemu-devel@nongnu.org; Fri, 27 Sep 2019 15:40:01 -0400 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]:34027) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iDw5v-0006bG-0W for qemu-devel@nongnu.org; Fri, 27 Sep 2019 15:39:59 -0400 Received: by mail-pl1-x641.google.com with SMTP id k7so1479050pll.1 for ; Fri, 27 Sep 2019 12:39:58 -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; bh=rr9SwpjvJyE9OAuq+Q5fU6KQ8tvMfOw0yzqcdXmDV6g=; b=aDT7BxonbwhBrtNiQmX53zn5ou3fwFVE475ELZ2hZu4zOdDFP+KFQLpH7OZnC6jesI d//jp4lLR/yEAZicDTnUWS80bdP8roJC2fzaxQi1kISAIITQ7xMyaUOlCNx5G92etJGO FX55EGLD5VvHr9biFtkOTTbpxizBgBBjXTDeCjxeDXL/x+hAu1giA4P6yGqLWrwOJf/A XkeFvGI4xNZfFS4kzx5wVDmdbuEE5dLpsvD0WWiVyAmTc+drBz5EP26WqUFI9/MpfCeA WVAHTrEeWrzDy5DgY646hJ0DnULm1WLHxKTC9rqDOB2Uv3wAYk8xAlAKTNYsqoZxbun7 kEqQ== 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; bh=rr9SwpjvJyE9OAuq+Q5fU6KQ8tvMfOw0yzqcdXmDV6g=; b=VUWe+xBTfQfhxwdzuBHHwn8aWlzL79RoilqmgETT+/yn0WM6CsE6QscjH1GNXQGI7k vruYGWztMokndOXKmuK/HD2+dR7vVYB5ulxLxW7wi+iwayGTUDpduHbRtVMwKnfbV+aR ezSUeaX4t/muVSazEl73MLeWQOGvIZIePNqQtwTwNMA/haXn1q6Dp5epUrQp0VQ6CW2i 6IB7+CEs9BFoWi+IC0OzE8Iwz7iR2u+b4v3X/FSu3lImkebHoGDHk4zV/99NdcYc+GlO 54XYO3ytp4F2dAZQAEaLPvjfdy+Ndt08DkkGv9n85e2KX4hQJ6RKFExNdqM8oaDBJ8d9 6DmQ== X-Gm-Message-State: APjAAAUqN8Q0dNiE95lHHDnmpw+itIXKGaH+UGnxVL8jNP2F42XrzaOt sR1ij9sjwB5Pbn9GZURShuVBrgtb1WM= X-Received: by 2002:a17:902:9a85:: with SMTP id w5mr6252924plp.316.1569613197162; Fri, 27 Sep 2019 12:39:57 -0700 (PDT) Received: from localhost.localdomain ([12.206.46.62]) by smtp.gmail.com with ESMTPSA id 192sm3676403pfb.110.2019.09.27.12.39.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Sep 2019 12:39:56 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 16/18] target/s390x: Remove ilen argument from trigger_access_exception Date: Fri, 27 Sep 2019 12:39:23 -0700 Message-Id: <20190927193925.23567-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190927193925.23567-1-richard.henderson@linaro.org> References: <20190927193925.23567-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::641 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, david@redhat.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The single caller passes ILEN_UNWIND; pass that along to trigger_pgm_exception directly. Reviewed-by: David Hildenbrand Signed-off-by: Richard Henderson --- target/s390x/mmu_helper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.17.1 diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c index 437e211366..768f50a255 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); } } @@ -511,7 +511,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++) {