{"id":815017,"url":"http://patchwork.ozlabs.org/api/patches/815017/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170918160012.4317-18-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-18-david@redhat.com>","list_archive_url":null,"date":"2017-09-18T16:00:02","name":"[v1,17/27] s390x/kvm: factor out actual handling of STOP interrupts","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"cdd336ab23248f47338b072fa6bf740fc96e0162","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-18-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/815017/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815017/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-mx07.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx07.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 3xwrkk00Dtz9s78\n\tfor ;\n\tTue, 19 Sep 2017 02:17:33 +1000 (AEST)","from localhost ([::1]:37651 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtyjk-0003vx-0l\n\tfor incoming@patchwork.ozlabs.org; Mon, 18 Sep 2017 12:17:32 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:37792)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtyUT-0007UV-0U\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 12:01:52 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtyUR-0008BI-Lg\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 12:01:45 -0400","from mx1.redhat.com ([209.132.183.28]:36326)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dtyUR-0008Ay-EV\n\tfor qemu-devel@nongnu.org; Mon, 18 Sep 2017 12:01:43 -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 6A16CC0828A6;\n\tMon, 18 Sep 2017 16:01:42 +0000 (UTC)","from t460s.redhat.com (unknown [10.36.118.72])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id EE0B35D6A8;\n\tMon, 18 Sep 2017 16:01:39 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 6A16CC0828A6","From":"David Hildenbrand ","To":"qemu-devel@nongnu.org","Date":"Mon, 18 Sep 2017 18:00:02 +0200","Message-Id":"<20170918160012.4317-18-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.31]);\n\tMon, 18 Sep 2017 16:01:42 +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 17/27] s390x/kvm: factor out actual handling\n\tof STOP interrupts","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":"For KVM, the KVM module decides when a STOP can be performed (when the\nSTOP interrupt can be processed). Factor it out so we can use it\nlater for TCG.\n\nSigned-off-by: David Hildenbrand \n---\n target/s390x/internal.h | 1 +\n target/s390x/kvm.c | 8 +-------\n target/s390x/sigp.c | 15 ++++++++++++++-\n 3 files changed, 16 insertions(+), 8 deletions(-)","diff":"diff --git a/target/s390x/internal.h b/target/s390x/internal.h\nindex 99413beeae..2e738de6af 100644\n--- a/target/s390x/internal.h\n+++ b/target/s390x/internal.h\n@@ -400,5 +400,6 @@ void s390x_translate_init(void);\n \n /* sigp.c */\n int handle_sigp(CPUS390XState *env, uint8_t order, uint64_t r1, uint64_t r3);\n+void do_stop_interrupt(CPUS390XState *env);\n \n #endif /* S390X_INTERNAL_H */\ndiff --git a/target/s390x/kvm.c b/target/s390x/kvm.c\nindex 142b63eef0..eb8b297a88 100644\n--- a/target/s390x/kvm.c\n+++ b/target/s390x/kvm.c\n@@ -1594,13 +1594,7 @@ static int handle_intercept(S390CPU *cpu)\n r = EXCP_HALTED;\n break;\n case ICPT_CPU_STOP:\n- if (s390_cpu_set_state(CPU_STATE_STOPPED, cpu) == 0) {\n- qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);\n- }\n- if (cpu->env.sigp_order == SIGP_STOP_STORE_STATUS) {\n- s390_store_status(cpu, S390_STORE_STATUS_DEF_ADDR, true);\n- }\n- cpu->env.sigp_order = 0;\n+ do_stop_interrupt(&cpu->env);\n r = EXCP_HALTED;\n break;\n case ICPT_OPEREXC:\ndiff --git a/target/s390x/sigp.c b/target/s390x/sigp.c\nindex 4813123aad..9587c3d319 100644\n--- a/target/s390x/sigp.c\n+++ b/target/s390x/sigp.c\n@@ -81,7 +81,7 @@ static void sigp_stop_and_store_status(CPUState *cs, run_on_cpu_data arg)\n case CPU_STATE_OPERATING:\n cpu->env.sigp_order = SIGP_STOP_STORE_STATUS;\n cpu_inject_stop(cpu);\n- /* store will be performed when handling the stop intercept */\n+ /* store will be performed in do_stop_interrup() */\n break;\n case CPU_STATE_STOPPED:\n /* already stopped, just store the status */\n@@ -360,6 +360,19 @@ int s390_cpu_restart(S390CPU *cpu)\n return 0;\n }\n \n+void do_stop_interrupt(CPUS390XState *env)\n+{\n+ S390CPU *cpu = s390_env_get_cpu(env);\n+\n+ if (s390_cpu_set_state(CPU_STATE_STOPPED, cpu) == 0) {\n+ qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);\n+ }\n+ if (cpu->env.sigp_order == SIGP_STOP_STORE_STATUS) {\n+ s390_store_status(cpu, S390_STORE_STATUS_DEF_ADDR, true);\n+ }\n+ env->sigp_order = 0;\n+}\n+\n void s390_init_sigp(void)\n {\n qemu_mutex_init(&qemu_sigp_mutex);\n","prefixes":["v1","17/27"]}