From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [PATCH qom-next 33/59] target-s390x: Pass S390CPU to s390_cpu_restart() Date: Wed, 23 May 2012 05:07:56 +0200 Message-ID: <1337742502-28565-34-git-send-email-afaerber@suse.de> References: <1337742502-28565-1-git-send-email-afaerber@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Alexander Graf (maintainer:S390), Avi Kivity (supporter:Overall), Marcelo Tosatti (supporter:Overall), kvm@vger.kernel.org (open list:Overall) To: qemu-devel@nongnu.org Return-path: Received: from cantor2.suse.de ([195.135.220.15]:35601 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964937Ab2EWDJL (ORCPT ); Tue, 22 May 2012 23:09:11 -0400 In-Reply-To: <1337742502-28565-1-git-send-email-afaerber@suse.de> Sender: kvm-owner@vger.kernel.org List-ID: Needed for qemu_cpu_kick(). Signed-off-by: Andreas F=C3=A4rber --- target-s390x/kvm.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 2153e38..5800fd6 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -292,8 +292,10 @@ static int handle_diag(CPUS390XState *env, struct = kvm_run *run, int ipb_code) return r; } =20 -static int s390_cpu_restart(CPUS390XState *env) +static int s390_cpu_restart(S390CPU *cpu) { + CPUS390XState *env =3D &cpu->env; + kvm_s390_interrupt(env, KVM_S390_RESTART, 0); s390_add_running_cpu(env); qemu_cpu_kick(env); @@ -362,7 +364,7 @@ static int handle_sigp(CPUS390XState *env, struct k= vm_run *run, uint8_t ipa1) =20 switch (order_code) { case SIGP_RESTART: - r =3D s390_cpu_restart(target_env); + r =3D s390_cpu_restart(target_cpu); break; case SIGP_STORE_STATUS_ADDR: r =3D s390_store_status(target_env, parameter); --=20 1.7.7 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45107) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SX1wo-0000fP-My for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SX1wm-0005i0-0u for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:14 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35603 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SX1wl-0005hR-QU for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:11 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 23 May 2012 05:07:56 +0200 Message-Id: <1337742502-28565-34-git-send-email-afaerber@suse.de> In-Reply-To: <1337742502-28565-1-git-send-email-afaerber@suse.de> References: <1337742502-28565-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH qom-next 33/59] target-s390x: Pass S390CPU to s390_cpu_restart() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Avi Kivity , Marcelo Tosatti , =?UTF-8?q?Andreas=20F=C3=A4rber?= , "open list:Overall" , Alexander Graf Needed for qemu_cpu_kick(). Signed-off-by: Andreas F=C3=A4rber --- target-s390x/kvm.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c index 2153e38..5800fd6 100644 --- a/target-s390x/kvm.c +++ b/target-s390x/kvm.c @@ -292,8 +292,10 @@ static int handle_diag(CPUS390XState *env, struct kv= m_run *run, int ipb_code) return r; } =20 -static int s390_cpu_restart(CPUS390XState *env) +static int s390_cpu_restart(S390CPU *cpu) { + CPUS390XState *env =3D &cpu->env; + kvm_s390_interrupt(env, KVM_S390_RESTART, 0); s390_add_running_cpu(env); qemu_cpu_kick(env); @@ -362,7 +364,7 @@ static int handle_sigp(CPUS390XState *env, struct kvm= _run *run, uint8_t ipa1) =20 switch (order_code) { case SIGP_RESTART: - r =3D s390_cpu_restart(target_env); + r =3D s390_cpu_restart(target_cpu); break; case SIGP_STORE_STATUS_ADDR: r =3D s390_store_status(target_env, parameter); --=20 1.7.7