From patchwork Tue Oct 1 17:16:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 174913 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp8860672ill; Tue, 1 Oct 2019 10:36:41 -0700 (PDT) X-Google-Smtp-Source: APXvYqxPl0DB/LIRZhjIIssJumKk4gUYDyXfrpJ9vBE3pLLYn5CvKJmSChj2wwZa6CZ+LGUmh3rP X-Received: by 2002:ae9:ea12:: with SMTP id f18mr7478035qkg.204.1569951400873; Tue, 01 Oct 2019 10:36:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569951400; cv=none; d=google.com; s=arc-20160816; b=GZLMIn0lO/LEIvJZdSbdjg+4X+6Ekbtu82Lg3uM7pJASJZ1au7TYEYgg3+b0pyrJaY udRcW//S7eoT5oiDg3Rt6Ygg3MPcw+Ve5HNOYgRxPLx1v19ID16aWVzyg4T4LubBTl4C zNHPK7Uul0jPspczOPGd1AmesIYd7rlQlSoD5L1mPtAD2BwgQfs6+qOXjFtkGZYZXFqV IE+0M2MNH1PtkLRl+288EVWxaZv3yIYtodZ3Zt6zbiKaRuvQOexHLHzpL78bqXF8n47w OF85f7O8/Xl18OfqVpFoev8cHPRYV/mRUtdaHlCLLEvU2Dwv6k77TjOOO0oR/kxwtArE jl0w== 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=T27/+7RLgsAKUaeTVz1uKZeEShCunhopOomrfELwqqY=; b=uSaCukD3FV6uHOYocgs6p5D59Cg+/I6QdpyXcrzGAhQkr6I8mA0hv2MPwnDXamatRf AZbjSoGPFk9d3sQuR7BxQuwxFVKYwFBm9fYgarwUBqAIt0LIbKC1LQO1TLX/A7ZqjTd4 4ZVpr3NzsJJfzhPRmvkvAtJUQul2hVLkvYBB7bagagXG8HNllLqQWrksWWXZ9ExEMGF2 66ybrvDtjwk4qONShJZBFB6P/rNmM+iw/sX39RQ84TGmutXPUP0aOcBlbqAfy+cW5K9z xCOZ9F3cLjuc8Je2beViVNxyHGkO4fHicl86YwAvZpKPHdlIj2zJUdgFPamQHhnHPJ6j kojg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kp5NU5ew; 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=pass (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 g20si16022162qte.192.2019.10.01.10.36.40 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 01 Oct 2019 10:36:40 -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=pass header.i=@linaro.org header.s=google header.b=kp5NU5ew; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:45868 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFM4l-0003cn-Rf for patch@linaro.org; Tue, 01 Oct 2019 13:36:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32978) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iFLlQ-0001kG-Dy for qemu-devel@nongnu.org; Tue, 01 Oct 2019 13:16:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iFLlP-0005d1-BW for qemu-devel@nongnu.org; Tue, 01 Oct 2019 13:16:40 -0400 Received: from mail-pg1-x541.google.com ([2607:f8b0:4864:20::541]:39530) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iFLlP-0005cc-6S for qemu-devel@nongnu.org; Tue, 01 Oct 2019 13:16:39 -0400 Received: by mail-pg1-x541.google.com with SMTP id e1so4578435pgj.6 for ; Tue, 01 Oct 2019 10:16: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; bh=T27/+7RLgsAKUaeTVz1uKZeEShCunhopOomrfELwqqY=; b=kp5NU5ewrUf6j+pZlpRB60fFTlIcbw89bU4zg65RlyPQJLnpb1xINweNtmyWotr3uh bbcCOz6tgw0zlB+OTJ1t5xRVosXuM39d/lkwv7ZTiimsfxlscmgx5nK+RspmHD4XQjDN nnCTgVP4m+0q2NVKVMkSRgA4BBoIvZzUcHaHhbm+ZFXLoINZEg4K1K1uZpk1Hhe2jYfS 7D4xDFWhiA4THWuwjyGOe+le41lxU98Z8YsB50KWVvDsAYjviFX99drtEh8QuE6qECvg J0YQOQYKSMmpljO7P4bD3xut5OgchUzjVZ7FT+pKjNiNWmPdsDES99h+JJORxXF57owo BX8Q== 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=T27/+7RLgsAKUaeTVz1uKZeEShCunhopOomrfELwqqY=; b=pKdpDP3SyVCgFeZn/pc/rAoYWwJ4tnhIAIjhvw9Osht88X4LWz1zoEkfJMv82HKAZL YxVL5EdgB2RFJvQ2Wyecnrp3FVJWDh5RlTxjKGqhDIr+BVYU7kLKuafDA9oo7WWdVNYR Jx42csbByINOSIwEskXRe3O/ZdZhSQ1l8c3NIQHMlEnQQldAioJ13zG15uNmkPWtASD4 HEWfl8IPGH99KpHiaDO+DI4/KTgvUE3p6zswV5N8UEsRuDRzVYyNLVVReKuQinugB+4D OKvecsdmFTGitrKXtmreTYzlrYpQgcp6sdc6Lq0193g46G2Gzcs+AZq5GO/+xCXTaCPQ nywQ== X-Gm-Message-State: APjAAAXMWwn19ORRxhXuHNs13Q4LbvjirgEPoyF0H7SYH23eEpIe5vK5 q0Xg9+4hCrtzXYoyTu1YGSYkEgkAb84= X-Received: by 2002:a63:1d02:: with SMTP id d2mr31211631pgd.190.1569950197258; Tue, 01 Oct 2019 10:16:37 -0700 (PDT) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id w7sm2863568pjn.1.2019.10.01.10.16.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Oct 2019 10:16:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v5 16/18] target/s390x: Remove ilen argument from trigger_access_exception Date: Tue, 1 Oct 2019 10:16:12 -0700 Message-Id: <20191001171614.8405-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191001171614.8405-1-richard.henderson@linaro.org> References: <20191001171614.8405-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::541 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: 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 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++) {