From patchwork Thu Sep 26 16:26:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 174487 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp2294891ill; Thu, 26 Sep 2019 09:39:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqz0QAZ9Qlew8Y8i0CIioEf4wo/eQYchRO6gFLHEWG8ZRogryauCm3RShAMaNbRkDcWs4b94 X-Received: by 2002:a37:2e01:: with SMTP id u1mr4250459qkh.455.1569515944760; Thu, 26 Sep 2019 09:39:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569515944; cv=none; d=google.com; s=arc-20160816; b=g3JXs1zriprI4SG8+mv+Dxsb9tSjztsFPvcL1g0wHKsk9VYwlxNIf6EoVQsvBH/kwE CJdAp9M9HufdMCk0NwDibW4AoXOjro6v4mepOVdNQpZd+dnABEMqzNG+NlHYLDssQAHI DKZ7X7WexxDuzI7c6hvv91MfZhw8I2VmksJ1VVTyoJCU8rQGRKCEq3RP2gQVQgkFOme9 SfbR41idNigPG0h/kbU9H3oXkUvudG532pZumdqfAnUlxtCOYtWJfec9fMPqw7DMqKcA O1MiA6OghdSw/LRNIHb5JFLX/4idP9Mb5rklwvinYacwS031uDe5uTA/mNEgW8l0Fkip iCcA== 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=8blXRqcbFbTzejzjElPQzOmrEhdRtWtBUHSTiMchkDQ=; b=dDMpyzay/9G07QRZSG1RL/33dM/ie6RKIxuwBk0nHS0iwfm6dQSk2QrFI9ZQhjhNHE b1Dl+E30tKp9GbH+CHTCStgC7c6hvRnWXObVPFa7Yjyg08++T+1A6Lueoan6Kc3+rboG 6m0B3+hQIFL69kZhtTIHQRK8WSFTjL0AVo7YOKAVk4BcgDgSGCQAld6N76L8h9g127Uu LM6M1EeNccw7ltzVy5Lsa7VZCrtowh+etifHLyuUSKmDCXvHo9lr/itSb22nqt7rl0yG kLZ9PspJULqCQlJQHpNrr1f/7pm1N3wo35Qo+OEyoW4LGB0IIQJt/hf+yUy6si1uep+8 vzhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=BZ5YQquK; 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 x50si1934828qta.272.2019.09.26.09.39.04 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Sep 2019 09:39:04 -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=BZ5YQquK; 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]:40838 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDWnH-0005QE-KM for patch@linaro.org; Thu, 26 Sep 2019 12:39:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41513) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDWcK-0002nf-1Z for qemu-devel@nongnu.org; Thu, 26 Sep 2019 12:27:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iDWcI-0004ss-Kr for qemu-devel@nongnu.org; Thu, 26 Sep 2019 12:27:43 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:35478) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iDWcI-0004s9-EC for qemu-devel@nongnu.org; Thu, 26 Sep 2019 12:27:42 -0400 Received: by mail-pf1-f195.google.com with SMTP id 205so2145531pfw.2 for ; Thu, 26 Sep 2019 09:27:42 -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=8blXRqcbFbTzejzjElPQzOmrEhdRtWtBUHSTiMchkDQ=; b=BZ5YQquK8X6lz7nhreQWrs1k3IxNPZv0U19B3cH71OjWHgYQqz9twCd9FekBkwb1lV YSVlN4BPR6Dh2geSQlrSTNg6Aaw3MyAoYTEVxZE2xHfwchxFgbPMS0pryPRNFDhnRJDE 3ljJL3NBBzDkaiXWDZxRB/peJCagVmefn6A+Cgs7u+61MuyixUoUKLMYkBU1/Y98mbbi jC3goPzuMX7O+shqhagS0HX/8fz0S/YdRueV1UC5ToHXBGat07X6qelwi8tLiYmREMys FpjHaUWJ5KFk0Veoxh5CmGcTU70LyDKGfsVOqTjPiGKaWH/OZ/Su/JcSotisgMZm5tiw 0lDw== 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=8blXRqcbFbTzejzjElPQzOmrEhdRtWtBUHSTiMchkDQ=; b=aRkTuBLVntM0J2lAX4LdOM6ZUKTTktZAA75ogLKgVpEOn2pprBGFgKA4hkv1IH8W9R kFJWnDU7YHrKzcLUn4YZ0xK31WbMETlOQ3FQZVQYypjbQnoAAT3ezuEDCsozDiFzt1Yx VYFjt2nm5Y5zWai7t6/+sPU0dWGAb1J4J0U5dyXWKmLKhz4ox7zdsY2RQi8b2SStyU4T HNLvRTQ6FZFzhe0c1Gh7EzwRtjKjcFQRlfhqG+0+x4vTApMz/ooAPC02q+gbEMa+96lh 43KLKrufnq28i2WEfhpq5wQ05yM/sT/efEQsHV6UcXgt5DvWdQToZe8smZQ6ttYUr8dV lhPQ== X-Gm-Message-State: APjAAAXMwwx2hIGEr26V8eBXPAofzADFLBG05CzIkiW9ao9tc9AL4FDB xJL8fWfO8WhViSyf0NZ23b9khTOMO/g= X-Received: by 2002:aa7:8e55:: with SMTP id d21mr4495837pfr.241.1569515200991; Thu, 26 Sep 2019 09:26:40 -0700 (PDT) Received: from localhost.localdomain ([12.157.10.114]) by smtp.gmail.com with ESMTPSA id 64sm4453169pfx.31.2019.09.26.09.26.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Sep 2019 09:26:40 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v3 17/18] target/s390x: Remove ilen argument from trigger_access_exception Date: Thu, 26 Sep 2019 09:26:14 -0700 Message-Id: <20190926162615.31168-18-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190926162615.31168-1-richard.henderson@linaro.org> References: <20190926162615.31168-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.210.195 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. Signed-off-by: Richard Henderson --- target/s390x/mmu_helper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.17.1 Reviewed-by: David Hildenbrand diff --git a/target/s390x/mmu_helper.c b/target/s390x/mmu_helper.c index bf7fddb056..e6c3139c57 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); } } @@ -482,7 +482,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++) {