From nobody Sun Feb 8 21:28:42 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@gnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@gnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1506631804115694.363042462543; Thu, 28 Sep 2017 13:50:04 -0700 (PDT) Received: from localhost ([::1]:60819 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dxfkh-0005b9-TK for importer@patchew.org; Thu, 28 Sep 2017 16:49:47 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53561) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dxfa2-0004lP-1h for qemu-devel@nongnu.org; Thu, 28 Sep 2017 16:38:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dxfZy-0003Y9-4R for qemu-devel@nongnu.org; Thu, 28 Sep 2017 16:38:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55500) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dxfZx-0003Xr-Rw for qemu-devel@nongnu.org; Thu, 28 Sep 2017 16:38:42 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D5B432BA922; Thu, 28 Sep 2017 20:38:40 +0000 (UTC) Received: from t460s.redhat.com (ovpn-116-18.ams2.redhat.com [10.36.116.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 240B86E506; Thu, 28 Sep 2017 20:38:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com D5B432BA922 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=david@redhat.com From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 28 Sep 2017 22:36:56 +0200 Message-Id: <20170928203708.9376-19-david@redhat.com> In-Reply-To: <20170928203708.9376-1-david@redhat.com> References: <20170928203708.9376-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 28 Sep 2017 20:38:41 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v2 18/30] s390x/kvm: factor out actual handling of STOP interrupts X-BeenThere: qemu-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: thuth@redhat.com, David Hildenbrand , cohuck@redhat.com, Richard Henderson , Alexander Graf , Christian Borntraeger Errors-To: qemu-devel-bounces+importer=patchew.org@gnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" For KVM, the KVM module decides when a STOP can be performed (when the STOP interrupt can be processed). Factor it out so we can use it later for TCG. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson --- target/s390x/internal.h | 1 + target/s390x/kvm.c | 8 +------- target/s390x/sigp.c | 15 ++++++++++++++- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/target/s390x/internal.h b/target/s390x/internal.h index d6ab45add4..2c3fc3fce0 100644 --- a/target/s390x/internal.h +++ b/target/s390x/internal.h @@ -418,5 +418,6 @@ void s390x_translate_init(void); =20 /* sigp.c */ int handle_sigp(CPUS390XState *env, uint8_t order, uint64_t r1, uint64_t r= 3); +void do_stop_interrupt(CPUS390XState *env); =20 #endif /* S390X_INTERNAL_H */ diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c index 1174e249ab..72008e436f 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -1597,13 +1597,7 @@ static int handle_intercept(S390CPU *cpu) r =3D EXCP_HALTED; break; case ICPT_CPU_STOP: - if (s390_cpu_set_state(CPU_STATE_STOPPED, cpu) =3D=3D 0) { - qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN= ); - } - if (cpu->env.sigp_order =3D=3D SIGP_STOP_STORE_STATUS) { - s390_store_status(cpu, S390_STORE_STATUS_DEF_ADDR, true); - } - cpu->env.sigp_order =3D 0; + do_stop_interrupt(&cpu->env); r =3D EXCP_HALTED; break; case ICPT_OPEREXC: diff --git a/target/s390x/sigp.c b/target/s390x/sigp.c index 4813123aad..9587c3d319 100644 --- a/target/s390x/sigp.c +++ b/target/s390x/sigp.c @@ -81,7 +81,7 @@ static void sigp_stop_and_store_status(CPUState *cs, run_= on_cpu_data arg) case CPU_STATE_OPERATING: cpu->env.sigp_order =3D SIGP_STOP_STORE_STATUS; cpu_inject_stop(cpu); - /* store will be performed when handling the stop intercept */ + /* store will be performed in do_stop_interrup() */ break; case CPU_STATE_STOPPED: /* already stopped, just store the status */ @@ -360,6 +360,19 @@ int s390_cpu_restart(S390CPU *cpu) return 0; } =20 +void do_stop_interrupt(CPUS390XState *env) +{ + S390CPU *cpu =3D s390_env_get_cpu(env); + + if (s390_cpu_set_state(CPU_STATE_STOPPED, cpu) =3D=3D 0) { + qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN); + } + if (cpu->env.sigp_order =3D=3D SIGP_STOP_STORE_STATUS) { + s390_store_status(cpu, S390_STORE_STATUS_DEF_ADDR, true); + } + env->sigp_order =3D 0; +} + void s390_init_sigp(void) { qemu_mutex_init(&qemu_sigp_mutex); --=20 2.13.5