{"id":807760,"url":"http://patchwork.ozlabs.org/api/patches/807760/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-34-cohuck@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170830165252.13421-34-cohuck@redhat.com>","list_archive_url":null,"date":"2017-08-30T16:52:41","name":"[PULL,33/44] target/s390x: move psw_key_valid() to mem_helper.c","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"f3b417d0f790300d5d27974d6d60df3692a2ae35","submitter":{"id":71914,"url":"http://patchwork.ozlabs.org/api/people/71914/?format=json","name":"Cornelia Huck","email":"cohuck@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170830165252.13421-34-cohuck@redhat.com/mbox/","series":[{"id":656,"url":"http://patchwork.ozlabs.org/api/series/656/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=656","date":"2017-08-30T16:52:08","name":"[PULL,01/44] s390x/css: use macro for event-information pending error recover code","version":1,"mbox":"http://patchwork.ozlabs.org/series/656/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/807760/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807760/checks/","tags":{},"related":[],"headers":{"Return-Path":"<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx01.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=cohuck@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xjBvD28J3z9s9Y\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 31 Aug 2017 03:14:32 +1000 (AEST)","from localhost ([::1]:51709 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dn6ZS-0003Ww-0v\n\tfor incoming@patchwork.ozlabs.org; Wed, 30 Aug 2017 13:14:30 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:57658)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <cohuck@redhat.com>) id 1dn6H8-0003nJ-2c\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:55:35 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <cohuck@redhat.com>) id 1dn6H7-0005tp-5L\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:55:34 -0400","from mx1.redhat.com ([209.132.183.28]:60322)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from <cohuck@redhat.com>) id 1dn6H6-0005t1-VR\n\tfor qemu-devel@nongnu.org; Wed, 30 Aug 2017 12:55:33 -0400","from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id C946A81E1B;\n\tWed, 30 Aug 2017 16:55:31 +0000 (UTC)","from localhost (ovpn-116-210.ams2.redhat.com [10.36.116.210])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id F25CF6951E;\n\tWed, 30 Aug 2017 16:55:28 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com C946A81E1B","From":"Cornelia Huck <cohuck@redhat.com>","To":"peter.maydell@linaro.org","Date":"Wed, 30 Aug 2017 18:52:41 +0200","Message-Id":"<20170830165252.13421-34-cohuck@redhat.com>","In-Reply-To":"<20170830165252.13421-1-cohuck@redhat.com>","References":"<20170830165252.13421-1-cohuck@redhat.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.16","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.25]);\n\tWed, 30 Aug 2017 16:55:31 +0000 (UTC)","Content-Transfer-Encoding":"quoted-printable","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL 33/44] target/s390x: move psw_key_valid() to\n\tmem_helper.c","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"<qemu-devel.nongnu.org>","List-Unsubscribe":"<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>","List-Archive":"<http://lists.nongnu.org/archive/html/qemu-devel/>","List-Post":"<mailto:qemu-devel@nongnu.org>","List-Help":"<mailto:qemu-devel-request@nongnu.org?subject=help>","List-Subscribe":"<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>","Cc":"thuth@redhat.com, david@redhat.com, Cornelia Huck <cohuck@redhat.com>,\n\tagraf@suse.de, qemu-devel@nongnu.org, borntraeger@de.ibm.com,\n\trth@twiddle.net","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>"},"content":"From: David Hildenbrand <david@redhat.com>\n\nOnly used in that file.\n\nReviewed-by: Thomas Huth <thuth@redhat.com>\nReviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>\nReviewed-by: Richard Henderson <richard.henderson@linaro.org>\nSigned-off-by: David Hildenbrand <david@redhat.com>\nMessage-Id: <20170818114353.13455-12-david@redhat.com>\nSigned-off-by: Cornelia Huck <cohuck@redhat.com>\n---\n target/s390x/cpu.h        | 11 -----------\n target/s390x/mem_helper.c | 11 +++++++++++\n 2 files changed, 11 insertions(+), 11 deletions(-)","diff":"diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h\nindex c71a4bf0c4..8300cb219d 100644\n--- a/target/s390x/cpu.h\n+++ b/target/s390x/cpu.h\n@@ -366,17 +366,6 @@ void s390x_cpu_debug_excp_handler(CPUState *cs);\n #define MMU_SECONDARY_IDX       1\n #define MMU_HOME_IDX            2\n \n-static inline bool psw_key_valid(CPUS390XState *env, uint8_t psw_key)\n-{\n-    uint16_t pkm = env->cregs[3] >> 16;\n-\n-    if (env->psw.mask & PSW_MASK_PSTATE) {\n-        /* PSW key has range 0..15, it is valid if the bit is 1 in the PKM */\n-        return pkm & (0x80 >> psw_key);\n-    }\n-    return true;\n-}\n-\n static inline int cpu_mmu_index(CPUS390XState *env, bool ifetch)\n {\n     switch (env->psw.mask & PSW_MASK_ASC) {\ndiff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c\nindex c71dce4b1e..b91c7402c4 100644\n--- a/target/s390x/mem_helper.c\n+++ b/target/s390x/mem_helper.c\n@@ -56,6 +56,17 @@ void tlb_fill(CPUState *cs, target_ulong addr, MMUAccessType access_type,\n #define HELPER_LOG(x...)\n #endif\n \n+static inline bool psw_key_valid(CPUS390XState *env, uint8_t psw_key)\n+{\n+    uint16_t pkm = env->cregs[3] >> 16;\n+\n+    if (env->psw.mask & PSW_MASK_PSTATE) {\n+        /* PSW key has range 0..15, it is valid if the bit is 1 in the PKM */\n+        return pkm & (0x80 >> psw_key);\n+    }\n+    return true;\n+}\n+\n /* Reduce the length so that addr + len doesn't cross a page boundary.  */\n static inline uint32_t adj_len_to_page(uint32_t len, uint64_t addr)\n {\n","prefixes":["PULL","33/44"]}