[v5] s390x cleanup

[RFC v5 09/13] target/s390x: make helper.c sysemu-only

Posted by Cho, Yu-Chen 4 years, 7 months ago

Now that we have moved cpu-dump functionality out of helper.c,
we can make the module sysemu-only.

Signed-off-by: Claudio Fontana <cfontana@suse.de>
Signed-off-by: Cho, Yu-Chen <acho@suse.com>
Acked-by: Cornelia Huck <cohuck@redhat.com>
---
 target/s390x/helper.c    | 6 +-----
 target/s390x/meson.build | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/target/s390x/helper.c b/target/s390x/helper.c
index 41ccc83d11..b9d18325bc 100644
--- a/target/s390x/helper.c
+++ b/target/s390x/helper.c
@@ -1,5 +1,5 @@
 /*
- *  S/390 helpers
+ *  S/390 helpers - systemu only
  *
  *  Copyright (c) 2009 Ulrich Hecht
  *  Copyright (c) 2011 Alexander Graf
@@ -27,11 +27,8 @@
 #include "hw/s390x/pv.h"
 #include "sysemu/hw_accel.h"
 #include "sysemu/runstate.h"
-#ifndef CONFIG_USER_ONLY
 #include "sysemu/tcg.h"
-#endif
 
-#ifndef CONFIG_USER_ONLY
 void s390x_tod_timer(void *opaque)
 {
     cpu_inject_clock_comparator((S390CPU *) opaque);
@@ -322,4 +319,3 @@ int s390_store_adtl_status(S390CPU *cpu, hwaddr addr, hwaddr len)
     cpu_physical_memory_unmap(sa, len, 1, len);
     return 0;
 }
-#endif /* CONFIG_USER_ONLY */
diff --git a/target/s390x/meson.build b/target/s390x/meson.build
index 6e1aa3b0cd..bbcaede384 100644
--- a/target/s390x/meson.build
+++ b/target/s390x/meson.build
@@ -4,7 +4,6 @@ s390x_ss.add(files(
   'cpu_features.c',
   'cpu_models.c',
   'gdbstub.c',
-  'helper.c',
   'interrupt.c',
   'cpu-dump.c',
 ))
@@ -23,6 +22,7 @@ s390x_ss.add(gen_features_h)
 
 s390x_softmmu_ss = ss.source_set()
 s390x_softmmu_ss.add(files(
+  'helper.c',
   'arch_dump.c',
   'diag.c',
   'ioinst.c',
-- 
2.32.0

Re: [RFC v5 09/13] target/s390x: make helper.c sysemu-only

Posted by Cornelia Huck 4 years, 7 months ago

On Tue, Jun 22 2021, "Cho, Yu-Chen" <acho@suse.com> wrote:

> Now that we have moved cpu-dump functionality out of helper.c,
> we can make the module sysemu-only.
>
> Signed-off-by: Claudio Fontana <cfontana@suse.de>
> Signed-off-by: Cho, Yu-Chen <acho@suse.com>
> Acked-by: Cornelia Huck <cohuck@redhat.com>
> ---
>  target/s390x/helper.c    | 6 +-----
>  target/s390x/meson.build | 2 +-
>  2 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/target/s390x/helper.c b/target/s390x/helper.c
> index 41ccc83d11..b9d18325bc 100644
> --- a/target/s390x/helper.c
> +++ b/target/s390x/helper.c
> @@ -1,5 +1,5 @@
>  /*
> - *  S/390 helpers
> + *  S/390 helpers - systemu only

Typo -- you probably meant "sysemu"? (Although I'd probably spell it out
as "system emulation".)

>   *
>   *  Copyright (c) 2009 Ulrich Hecht
>   *  Copyright (c) 2011 Alexander Graf

Re: [RFC v5 09/13] target/s390x: make helper.c sysemu-only

Posted by Al Cho 4 years, 7 months ago

Yes, it should be "sysemu", it's a typo.
________________________________
From: Cornelia Huck <cohuck@redhat.com>
Sent: Tuesday, June 22, 2021 7:42 PM
To: Al Cho <ACho@suse.com>; qemu-devel@nongnu.org <qemu-devel@nongnu.org>; qemu-s390x@nongnu.org <qemu-s390x@nongnu.org>
Cc: Claudio Fontana <Claudio.Fontana@suse.com>; Al Cho <ACho@suse.com>; Claudio Fontana <cfontana@suse.de>
Subject: Re: [RFC v5 09/13] target/s390x: make helper.c sysemu-only

On Tue, Jun 22 2021, "Cho, Yu-Chen" <acho@suse.com> wrote:

> Now that we have moved cpu-dump functionality out of helper.c,
> we can make the module sysemu-only.
>
> Signed-off-by: Claudio Fontana <cfontana@suse.de>
> Signed-off-by: Cho, Yu-Chen <acho@suse.com>
> Acked-by: Cornelia Huck <cohuck@redhat.com>
> ---
>  target/s390x/helper.c    | 6 +-----
>  target/s390x/meson.build | 2 +-
>  2 files changed, 2 insertions(+), 6 deletions(-)
>
> diff --git a/target/s390x/helper.c b/target/s390x/helper.c
> index 41ccc83d11..b9d18325bc 100644
> --- a/target/s390x/helper.c
> +++ b/target/s390x/helper.c
> @@ -1,5 +1,5 @@
>  /*
> - *  S/390 helpers
> + *  S/390 helpers - systemu only

Typo -- you probably meant "sysemu"? (Although I'd probably spell it out
as "system emulation".)

>   *
>   *  Copyright (c) 2009 Ulrich Hecht
>   *  Copyright (c) 2011 Alexander Graf