From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49396) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1difha-0002Gc-Lc for qemu-devel@nongnu.org; Fri, 18 Aug 2017 07:44:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1difhZ-0007KK-2P for qemu-devel@nongnu.org; Fri, 18 Aug 2017 07:44:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60744) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1difhY-0007In-Sc for qemu-devel@nongnu.org; Fri, 18 Aug 2017 07:44:33 -0400 From: David Hildenbrand Date: Fri, 18 Aug 2017 13:43:47 +0200 Message-Id: <20170818114353.13455-13-david@redhat.com> In-Reply-To: <20170818114353.13455-1-david@redhat.com> References: <20170818114353.13455-1-david@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v3 for-2.11 12/18] target/s390x: move s390_do_cpu_reset() to diag.c List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: rth@twiddle.net, Aurelien Jarno , thuth@redhat.com, cohuck@redhat.com, david@redhat.com, borntraeger@de.ibm.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Only used in that file. Also drop the comment, not really needed. Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Signed-off-by: David Hildenbrand --- target/s390x/cpu.h | 7 ------- target/s390x/diag.c | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 8300cb2..9cdce6c 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -490,13 +490,6 @@ static inline hwaddr decode_basedisp_s(CPUS390XState= *env, uint32_t ipb, /* Base/displacement are at the same locations. */ #define decode_basedisp_rs decode_basedisp_s =20 -/* helper functions for run_on_cpu() */ -static inline void s390_do_cpu_reset(CPUState *cs, run_on_cpu_data arg) -{ - S390CPUClass *scc =3D S390_CPU_GET_CLASS(cs); - - scc->cpu_reset(cs); -} static inline void s390_do_cpu_full_reset(CPUState *cs, run_on_cpu_data = arg) { cpu_reset(cs); diff --git a/target/s390x/diag.c b/target/s390x/diag.c index 10ac845..1847cdb 100644 --- a/target/s390x/diag.c +++ b/target/s390x/diag.c @@ -39,6 +39,13 @@ static int modified_clear_reset(S390CPU *cpu) return 0; } =20 +static inline void s390_do_cpu_reset(CPUState *cs, run_on_cpu_data arg) +{ + S390CPUClass *scc =3D S390_CPU_GET_CLASS(cs); + + scc->cpu_reset(cs); +} + static int load_normal_reset(S390CPU *cpu) { S390CPUClass *scc =3D S390_CPU_GET_CLASS(cpu); --=20 2.9.4