{"id":815011,"url":"http://patchwork.ozlabs.org/api/patches/815011/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170918160012.4317-10-david@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":"<20170918160012.4317-10-david@redhat.com>","list_archive_url":null,"date":"2017-09-18T15:59:54","name":"[v1,09/27] target/s390x: factor out handling of WAIT PSW into handle_wait()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"7b9d7986bd91ced9c3d84b03a60f5a2bf12b90f8","submitter":{"id":70402,"url":"http://patchwork.ozlabs.org/api/people/70402/?format=json","name":"David Hildenbrand","email":"david@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170918160012.4317-10-david@redhat.com/mbox/","series":[{"id":3672,"url":"http://patchwork.ozlabs.org/api/series/3672/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3672","date":"2017-09-18T15:59:45","name":"s390x: SMP for TCG (+ cleanups)","version":1,"mbox":"http://patchwork.ozlabs.org/series/3672/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815011/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815011/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=208.118.235.17; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx03.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx03.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=david@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [208.118.235.17])\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 3xwrfb1mPdz9s7F\n\tfor ;\n\tTue, 19 Sep 2017 02:13:58 +1000 (AEST)","from localhost ([::1]:37631 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtygG-0000ii-Hs\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 12:13:56 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:37471)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtyU4-00078U-Ic\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 12:01:24 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtyTy-0007vd-Ti\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 12:01:20 -0400","from mx1.redhat.com ([209.132.183.28]:48112)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dtyTy-0007vR-Mj\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 12:01:14 -0400","from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15])\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 A577B7E442;\n\tMon, 18 Sep 2017 16:01:13 +0000 (UTC)","from t460s.redhat.com (unknown [10.36.118.72])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 219305D760;\n\tMon, 18 Sep 2017 16:01:10 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com A577B7E442","From":"David Hildenbrand ","To":"qemu-devel@nongnu.org","Date":"Mon, 18 Sep 2017 17:59:54 +0200","Message-Id":"<20170918160012.4317-10-david@redhat.com>","In-Reply-To":"<20170918160012.4317-1-david@redhat.com>","References":"<20170918160012.4317-1-david@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.15","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.27]);\n\tMon, 18 Sep 2017 16:01:13 +0000 (UTC)","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] [PATCH v1 09/27] target/s390x: factor out handling of\n\tWAIT PSW into handle_wait()","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Matthew Rosato , thuth@redhat.com,\n\tdavid@redhat.com, cohuck@redhat.com, Richard Henderson\n\t, Alexander Graf ,\n\tborntraeger@de.ibm.com, \tIgor Mammedov ,\n\t=?utf-8?q?Alex_Benn=C3=A9e?= ,\n\tAurelien Jarno ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"This will now also detect crashes under TCG. We can directly use\ncpu->env.psw.addr instead of kvm_run, as we do a\ncpu_synchronize_state().\n\nSigned-off-by: David Hildenbrand \n---\n target/s390x/helper.c | 28 ++++++++++++++++++++++------\n target/s390x/internal.h | 1 +\n target/s390x/kvm.c | 15 +--------------\n 3 files changed, 24 insertions(+), 20 deletions(-)","diff":"diff --git a/target/s390x/helper.c b/target/s390x/helper.c\nindex e22b93258b..75ceb0bf2b 100644\n--- a/target/s390x/helper.c\n+++ b/target/s390x/helper.c\n@@ -26,6 +26,7 @@\n #include \"qemu/timer.h\"\n #include \"exec/exec-all.h\"\n #include \"hw/s390x/ioinst.h\"\n+#include \"sysemu/hw_accel.h\"\n #ifndef CONFIG_USER_ONLY\n #include \"sysemu/sysemu.h\"\n #endif\n@@ -113,6 +114,26 @@ hwaddr s390_cpu_get_phys_addr_debug(CPUState *cs, vaddr vaddr)\n return phys_addr;\n }\n \n+static inline bool is_special_wait_psw(uint64_t psw_addr)\n+{\n+ /* signal quiesce */\n+ return psw_addr == 0xfffUL;\n+}\n+\n+void handle_wait(S390CPU *cpu)\n+{\n+ cpu_synchronize_state(CPU(cpu));\n+ if (s390_cpu_halt(cpu) == 0) {\n+#ifndef CONFIG_USER_ONLY\n+ if (is_special_wait_psw(cpu->env.psw.addr)) {\n+ qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);\n+ } else {\n+ qemu_system_guest_panicked(NULL);\n+ }\n+#endif\n+ }\n+}\n+\n void load_psw(CPUS390XState *env, uint64_t mask, uint64_t addr)\n {\n uint64_t old_mask = env->psw.mask;\n@@ -128,12 +149,7 @@ void load_psw(CPUS390XState *env, uint64_t mask, uint64_t addr)\n }\n \n if (mask & PSW_MASK_WAIT) {\n- S390CPU *cpu = s390_env_get_cpu(env);\n- if (s390_cpu_halt(cpu) == 0) {\n-#ifndef CONFIG_USER_ONLY\n- qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);\n-#endif\n- }\n+ handle_wait(s390_env_get_cpu(env));\n }\n }\n \ndiff --git a/target/s390x/internal.h b/target/s390x/internal.h\nindex 15743ec40f..cb331f35ea 100644\n--- a/target/s390x/internal.h\n+++ b/target/s390x/internal.h\n@@ -280,6 +280,7 @@ const char *cc_name(enum cc_op cc_op);\n void load_psw(CPUS390XState *env, uint64_t mask, uint64_t addr);\n uint32_t calc_cc(CPUS390XState *env, uint32_t cc_op, uint64_t src, uint64_t dst,\n uint64_t vr);\n+void handle_wait(S390CPU *cpu);\n \n \n /* cpu.c */\ndiff --git a/target/s390x/kvm.c b/target/s390x/kvm.c\nindex 3f9983154f..14f864697d 100644\n--- a/target/s390x/kvm.c\n+++ b/target/s390x/kvm.c\n@@ -1936,12 +1936,6 @@ static int handle_instruction(S390CPU *cpu, struct kvm_run *run)\n return r;\n }\n \n-static bool is_special_wait_psw(CPUState *cs)\n-{\n- /* signal quiesce */\n- return cs->kvm_run->psw_addr == 0xfffUL;\n-}\n-\n static void unmanageable_intercept(S390CPU *cpu, const char *str, int pswoffset)\n {\n CPUState *cs = CPU(cpu);\n@@ -2012,14 +2006,7 @@ static int handle_intercept(S390CPU *cpu)\n break;\n case ICPT_WAITPSW:\n /* disabled wait, since enabled wait is handled in kernel */\n- cpu_synchronize_state(cs);\n- if (s390_cpu_halt(cpu) == 0) {\n- if (is_special_wait_psw(cs)) {\n- qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);\n- } else {\n- qemu_system_guest_panicked(NULL);\n- }\n- }\n+ handle_wait(cpu);\n r = EXCP_HALTED;\n break;\n case ICPT_CPU_STOP:\n","prefixes":["v1","09/27"]}