Re: gitlab-ci: amd64-opensuse-leap-container job failing

2021-09-27 Thread Al Cho
On Mon, 2021-09-27 at 09:35 +0100, Daniel P. Berrangé wrote:
> On Sun, Sep 26, 2021 at 07:23:56PM +0200, Philippe Mathieu-Daudé wrote:
> > Hi,
> > 
> > FYI the OpenSUSE job is failing since few days, i.e.:
> > https://gitlab.com/qemu-project/qemu/-/jobs/1622345026
> > 
> >   Retrieving repository 'Main Repository' metadata
> > [..error]
> >   Repository 'Main Repository' is invalid.
> > 
> > [repo-
> > oss|http://download.opensuse.org/distribution/leap/15.2/repo/oss/]
> > Valid metadata not found at specified URL
> >   History:
> >    - Download (curl) error for
> > '
> > http://download.opensuse.org/distribution/leap/15.2/repo/oss/repodata/repomd.xml'
> > :
> >   Error code: Curl error 56
> >   Error message: Recv failure: Connection reset by peer
> >    - Can't provide /repodata/repomd.xml
> >   Please check if the URIs defined for this repository are pointing
> > to a
> > valid repository.
> >   Warning: Skipping repository 'Main Repository' because of the above
> > error.
> > 
> > I tried to run 'zypper ref' with:
> 
> It isn't confined to only SuSE. In libvirt we've had similar problems
> with several other jobs, though are suse jobs are the worst affected.
> 
> GitLab have finally acknowledged it is an general infra issue affecting
> many things:
> 
>    https://status.gitlab.com/
>    https://gitlab.com/gitlab-com/gl-infra/production/-/issues/5590
> 
> > -- >8 --
> > --- a/tests/docker/dockerfiles/opensuse-leap.docker
> > +++ b/tests/docker/dockerfiles/opensuse-leap.docker
> > @@ -109,5 +109,7 @@ ENV PACKAGES \
> >  zlib-devel
> >  ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3.6
> > 
> > -RUN zypper update -y && zypper --non-interactive install -y
> > $PACKAGES
> > +RUN zypper refresh && \
> > +    zypper update -y && \
> > +    zypper --non-interactive install -y $PACKAGES
> >  RUN rpm -q $PACKAGES | sort > /packages.txt
> > ---
> > 
> > but no luck: https://gitlab.com/philmd/qemu/-/jobs/1623554962
> > 
> > Should we temporarily disable to job and its dependencies?
> 
> Given it is believed to be a gitlab infra issue, rather than a problem
> of ours, or something we're using, I think best to wait a little longer
> to see if they get fix the infra.
> 

agree, and I am also checking the status of it.
for now the http://download.opensuse.org/distribution/leap/15.2 and the
repo works.
Will follow up it.

Cheers,
  AL


Re: [PATCH v7 01/14] target/s390x: meson: add target_user_arch

2021-07-09 Thread Al Cho
On Thu, 2021-07-08 at 19:20 +0200, Cornelia Huck wrote:
> On Wed, Jul 07 2021, "Cho, Yu-Chen"  wrote:
> 
> > the lack of target_user_arch makes it hard to fully leverage the
> > build system in order to separate user code from sysemu code.
> > 
> > Provide it, so that we can avoid the proliferation of #ifdef
> > in target code.
> > 
> > Signed-off-by: Claudio Fontana 
> > Signed-off-by: Cho, Yu-Chen 
> 
> Just noticed when I was sending a pull request: your unquoted name in
> the s-o-b confuses git send-email when it is doing its automatic cc:s
> (it adds a 'cc:Cho', which is obviously bogus and leads to the mail
> being rejected by the list server.) Not sure whether git send-email
> should add proper quoting itself, but putting quoting in the s-o-b
> line
> is probably a good idea (I'm wondering why git didn't add it in the
> first place.)
> 

Not sure what happened here, but I didn't get any wrong from git send-
email before.

> Are you fine with me modifying your s-o-b lines in the commits to
> include quoting, if I need to resend the pull req?
> 

yes, please and thanks.

Cheers,
  AL


> > Acked-by: Cornelia Huck 
> > Reviewed-by: Richard Henderson 
> > ---
> >  target/s390x/meson.build | 3 +++
> >  1 file changed, 3 insertions(+)
> 



Re: [RFC v6 12/13] target/s390x: move kvm files into kvm/

2021-07-06 Thread Al Cho
On Thu, 2021-07-01 at 21:30 +0200, Thomas Huth wrote:
> On 29/06/2021 16.19, Cho, Yu-Chen wrote:
> > move kvm files into kvm/
> > After the reshuffling, update MAINTAINERS accordingly.
> > Make use of the new directory:
> > 
> > target/s390x/kvm/
> > 
> > Signed-off-by: Claudio Fontana 
> > Signed-off-by: Cho, Yu-Chen 
> > ---
> [...]
> > diff --git a/meson.build b/meson.build
> > index a91b39465c..293d509c7e 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -1886,6 +1886,7 @@ if have_system or have_user
> >   'target/ppc',
> >   'target/riscv',
> >   'target/s390x',
> > +    'target/s390x/kvm',
> 
> You've added this to the "have_system or have_user" section ...
> however, I 
> think the KVM code should not be required at all if compiling with 
> --disable-system, since the linux-user builds require TCG only.
> 
> So it might be cleaner to add this in the "if have_system" section
> instead?
> 

Yes, I agree with you the KVM code does not be required at all if
compiling with --disable-system.
But I think it's fine to add this here, if we want to change to the "if
have_system" section, it might be better in another patch and include
target/i386/kvm.


> >   'target/sparc',
> >     ]
> >   endif
> [...]
> > diff --git a/target/s390x/kvm.c b/target/s390x/kvm/kvm.c
> > similarity index 99%
> > rename from target/s390x/kvm.c
> > rename to target/s390x/kvm/kvm.c
> > index 5b1fdb55c4..07dae06de8 100644
> > --- a/target/s390x/kvm.c
> > +++ b/target/s390x/kvm/kvm.c
> > @@ -27,7 +27,7 @@
> >   #include "qemu-common.h"
> >   #include "cpu.h"
> >   #include "s390x-internal.h"
> > -#include "kvm_s390x.h"
> > +#include "kvm/kvm_s390x.h"
> 
> No need to add the kvm/ prefix here since the file is in the same
> folder.
> 

indeed, will remove this.

Thanks,
  AL



Re: [RFC v6 08/13] target/s390x: split cpu-dump from helper.c

2021-07-06 Thread Al Cho
On Mon, 2021-07-05 at 08:25 +0200, Claudio Fontana wrote:
> On 7/2/21 9:25 AM, Al Cho wrote:
> > On Thu, 2021-07-01 at 14:35 +0200, Thomas Huth wrote:
> > > On 29/06/2021 16.19, Cho, Yu-Chen wrote:
> > > > Splitting this functionality also allows us to make helper.c
> > > > sysemu-
> > > > only.
> > > > 
> > > > Signed-off-by: Claudio Fontana 
> > > > Signed-off-by: Cho, Yu-Chen 
> > > > Acked-by: Cornelia Huck 
> > > > ---
> > > >   target/s390x/cpu-dump.c  | 176
> > > > +++
> > > 
> > > Apart from the dump() function, the other functions here are are
> > > used
> > > in 
> > > other contexts, too, so maybe the name is not very appropriate
> > > here...
> > > What 
> > > about naming it "cpu-state.c" instead? Or include the functions
> > > in
> > > cpu.c 
> > > directly?
> > > 
> > 
> > ok, I think naming it "cpu-state.c" would make more sense.
> > 
> > Thanks,
> >     AL
> > 
> 
> For context, cpu-dump.c mimics how this is done on x86,
> 
> so rather than coming up with creative new names for each
> architecture,

I think Claudio is right, I didn't recognize it before. sorry.

> I'd rather either put the code into cpu.c, or just keep the existing
> "cpu-dump.c" as in the initially proposed patch, which looks like the
> best option to me.
> 

For me just keep the existing "cpu-dump.c" as in the initially proposed
patch would be the better one option.
But it's also good to me if we keep the dump() function in cpu-dump.c
and put other functions into cpu.c.

Cheers,
  AL


Re: [RFC v6 08/13] target/s390x: split cpu-dump from helper.c

2021-07-02 Thread Al Cho
On Thu, 2021-07-01 at 14:35 +0200, Thomas Huth wrote:
> On 29/06/2021 16.19, Cho, Yu-Chen wrote:
> > Splitting this functionality also allows us to make helper.c sysemu-
> > only.
> > 
> > Signed-off-by: Claudio Fontana 
> > Signed-off-by: Cho, Yu-Chen 
> > Acked-by: Cornelia Huck 
> > ---
> >   target/s390x/cpu-dump.c  | 176
> > +++
> 
> Apart from the dump() function, the other functions here are are used
> in 
> other contexts, too, so maybe the name is not very appropriate here...
> What 
> about naming it "cpu-state.c" instead? Or include the functions in
> cpu.c 
> directly?
> 

ok, I think naming it "cpu-state.c" would make more sense.

Thanks,
AL



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

2021-07-02 Thread Al Cho
On Thu, 2021-07-01 at 14:36 +0200, Thomas Huth wrote:
> On 29/06/2021 16.19, Cho, Yu-Chen 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 
> > Signed-off-by: Cho, Yu-Chen 
> > Acked-by: Cornelia Huck 
> > ---
> >   target/s390x/helper.c    | 9 +
> >   target/s390x/meson.build | 2 +-
> >   2 files changed, 2 insertions(+), 9 deletions(-)
> > 
> > diff --git a/target/s390x/helper.c b/target/s390x/helper.c
> > index c72e990f4d..a4d4665f67 100644
> > --- a/target/s390x/helper.c
> > +++ b/target/s390x/helper.c
> > @@ -1,5 +1,5 @@
> >   /*
> > - *  S/390 helpers
> > + *  S/390 helpers - systemu only
> 
> s/systemu/sysemu/
> 
> With that typo fixed:
> Reviewed-by: Thomas Huth 
> 

That's a stupid mistake, it should be fixed this version.
Will fix it.

Thanks,
  AL


Re: [RFC v6 06/13] target/s390x: start moving TCG-only code to tcg/

2021-07-02 Thread Al Cho
On Thu, 2021-07-01 at 12:51 +0200, Thomas Huth wrote:
> On 29/06/2021 16.19, Cho, Yu-Chen wrote:
> > move everything related to translate, as well as HELPER code in tcg/
> > 
> > mmu_helper.c stays put for now, as it contains both TCG and KVM code.
> > 
> > The internal.h file is renamed to s390x-internal.h, because of the
> > risk of collision with other files with the same name.
> 
> IMHO the renaming from internal.h to s390x-internal.h should be done in
> a 
> separate patch, since it's not directly related to the movement of the
> other 
> files.
> 

Indeed, this patch should not include this. The renaming from
internal.h to s390x-internal.h would be done in a separate patch.


> [...]
> > diff --git a/target/s390x/internal.h b/target/s390x/s390x-
> > internal.h
> > similarity index 98%
> > rename from target/s390x/internal.h
> > rename to target/s390x/s390x-internal.h
> > index 9256275376..17edd4d13b 100644
> > --- a/target/s390x/internal.h
> > +++ b/target/s390x/s390x-internal.h
> > @@ -240,6 +240,12 @@ uint32_t calc_cc(CPUS390XState *env, uint32_t
> > cc_op, uint64_t src, uint64_t dst,
> >   #ifndef CONFIG_USER_ONLY
> >   unsigned int s390_cpu_halt(S390CPU *cpu);
> >   void s390_cpu_unhalt(S390CPU *cpu);
> > +void s390_cpu_init_sysemu(Object *obj);
> > +bool s390_cpu_realize_sysemu(DeviceState *dev, Error **errp);
> > +void s390_cpu_finalize(Object *obj);
> > +void s390_cpu_class_init_sysemu(CPUClass *cc);
> > +void s390_cpu_machine_reset_cb(void *opaque);
> 
> This hunk rather belongs into the next patch instead.
> 

True, this part in 07 would be better, I will move this to 07.

Thanks, AL


Re: [RFC v6 02/13] hw/s390x: rename tod-qemu.c to tod-tcg.c

2021-07-01 Thread Al Cho
On Thu, 2021-07-01 at 12:11 +0200, Thomas Huth wrote:
> On 29/06/2021 16.19, Cho, Yu-Chen wrote:
> > we stop short of renaming the actual qom object though,
> > so type remains TYPE_QEMU_S390_TOD, ie "s390-tod-qemu".
> > 
> > Signed-off-by: Claudio Fontana 
> > Reviewed-by: David Hildenbrand 
> > Reviewed-by: Cornelia Huck 
> > Signed-off-by: Cho, Yu-Chen 
> > ---
> >   hw/s390x/meson.build   | 2 +-
> >   hw/s390x/{tod-qemu.c => tod-tcg.c} | 0
> >   2 files changed, 1 insertion(+), 1 deletion(-)
> >   rename hw/s390x/{tod-qemu.c => tod-tcg.c} (100%)
> > 
> > diff --git a/hw/s390x/meson.build b/hw/s390x/meson.build
> > index 327e9c93af..02e81a9467 100644
> > --- a/hw/s390x/meson.build
> > +++ b/hw/s390x/meson.build
> > @@ -16,7 +16,7 @@ s390x_ss.add(files(
> >     'sclp.c',
> >     'sclpcpu.c',
> >     'sclpquiesce.c',
> > -  'tod-qemu.c',
> > +  'tod-tcg.c',
> >     'tod.c',
> >   ))
> >   s390x_ss.add(when: 'CONFIG_KVM', if_true: files(
> > diff --git a/hw/s390x/tod-qemu.c b/hw/s390x/tod-tcg.c
> > similarity index 100%
> > rename from hw/s390x/tod-qemu.c
> > rename to hw/s390x/tod-tcg.c
> 
> Might be worth the effort to also change the comment at the top of
> the file 
> ("TCG implementation" instead of "QEMU implementation").
> 

right, will change it.

Thanks,
  AL

> Anyway:
> Reviewed-by: Thomas Huth 
> 



Re: [RFC v6 04/13] hw/s390x: tod: make explicit checks for accelerators when initializing

2021-07-01 Thread Al Cho via
ok, will swap 03 and 04 in next version.

Thanks,
AL

From: Thomas Huth 
Sent: Thursday, July 1, 2021 6:32 PM
To: Al Cho ; qemu-devel@nongnu.org ; 
qemu-s3...@nongnu.org 
Cc: Claudio Fontana ; José Ricardo Ziviani 
; Claudio Fontana ; David Hildenbrand 
; Cornelia Huck 
Subject: Re: [RFC v6 04/13] hw/s390x: tod: make explicit checks for 
accelerators when initializing

On 29/06/2021 16.19, Cho, Yu-Chen wrote:
> replace general "else" with specific checks for each possible accelerator.
>
> Handle qtest as a NOP, and error out for an unknown accelerator used in
> combination with tod.
>
> Signed-off-by: Claudio Fontana 
> Reviewed-by: David Hildenbrand 
> Reviewed-by: Cornelia Huck 
> Signed-off-by: Cho, Yu-Chen 
> ---
>   hw/s390x/tod.c | 9 -
>   1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/hw/s390x/tod.c b/hw/s390x/tod.c
> index 3c2979175e..fd5a36bf24 100644
> --- a/hw/s390x/tod.c
> +++ b/hw/s390x/tod.c
> @@ -14,6 +14,8 @@
>   #include "qemu/error-report.h"
>   #include "qemu/module.h"
>   #include "sysemu/kvm.h"
> +#include "sysemu/tcg.h"
> +#include "sysemu/qtest.h"
>   #include "migration/qemu-file-types.h"
>   #include "migration/register.h"
>
> @@ -23,8 +25,13 @@ void s390_init_tod(void)
>
>   if (kvm_enabled()) {
>   obj = object_new(TYPE_KVM_S390_TOD);
> -} else {
> +} else if (tcg_enabled()) {
>   obj = object_new(TYPE_QEMU_S390_TOD);
> +} else if (qtest_enabled()) {
> +return;
> +} else {
> +error_report("current accelerator not handled in s390_init_tod!");
> +abort();
>   }
>   object_property_add_child(qdev_get_machine(), TYPE_S390_TOD, obj);
>   object_unref(obj);
>

I think it might be better to swap the order of patch 03 and 04, to avoid
that the qtests might break during bisecting later.

For this patch itself:
Reviewed-by: Thomas Huth 



Re: [RFC v6 10/13] target/s390x: use kvm_enabled() to wrap call to kvm_s390_get_hpage_1m

2021-06-30 Thread Al Cho
Hi Cornelia,

Sorry for missing the reply.
I think it may not be worth it, as you said it seem to be the only call site 
for kvm_s390_get_hpage_1m().
So I think we could keep it.

Thanks,
AL

From: Cornelia Huck 
Sent: Wednesday, June 30, 2021 11:21 PM
To: Al Cho ; qemu-devel@nongnu.org ; 
qemu-s3...@nongnu.org 
Cc: Claudio Fontana ; Al Cho ; José 
Ricardo Ziviani ; Claudio Fontana 
Subject: Re: [RFC v6 10/13] target/s390x: use kvm_enabled() to wrap call to 
kvm_s390_get_hpage_1m

On Tue, Jun 29 2021, "Cho, Yu-Chen"  wrote:

> this will allow to remove the kvm stubs.
>
> Signed-off-by: Claudio Fontana 
> Signed-off-by: Cho, Yu-Chen 
> ---
>  target/s390x/diag.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/target/s390x/diag.c b/target/s390x/diag.c
> index c17a2498a7..8405f69df0 100644
> --- a/target/s390x/diag.c
> +++ b/target/s390x/diag.c
> @@ -20,6 +20,7 @@
>  #include "hw/s390x/ipl.h"
>  #include "hw/s390x/s390-virtio-ccw.h"
>  #include "hw/s390x/pv.h"
> +#include "sysemu/kvm.h"
>  #include "kvm_s390x.h"
>
>  int handle_diag_288(CPUS390XState *env, uint64_t r1, uint64_t r3)
> @@ -168,7 +169,7 @@ out:
>  return;
>  }
>
> -if (kvm_s390_get_hpage_1m()) {
> +if (kvm_enabled() && kvm_s390_get_hpage_1m()) {

I think I asked before whether we should introduce a
s390_huge_page_backing() wrapper (which might be overkill)... any
opinions on that? I'm not really opposed to this patch here, either.

>  error_report("Protected VMs can currently not be backed with "
>   "huge pages");
>  env->regs[r1 + 1] = DIAG_308_RC_INVAL_FOR_PV;



Re: [RFC v5 06/13] target/s390x: start moving TCG-only code to tcg/

2021-06-23 Thread Al Cho
Yes, you are right.
I think keep the old pattern is better.

From: Cornelia Huck 
Sent: Tuesday, June 22, 2021 7:39 PM
To: Al Cho ; qemu-devel@nongnu.org ; 
qemu-s3...@nongnu.org 
Cc: Claudio Fontana ; Al Cho ; Claudio 
Fontana ; David Hildenbrand 
Subject: Re: [RFC v5 06/13] target/s390x: start moving TCG-only code to tcg/

On Tue, Jun 22 2021, "Cho, Yu-Chen"  wrote:

> move everything related to translate, as well as HELPER code in tcg/
>
> mmu_helper.c stays put for now, as it contains both TCG and KVM code.
>
> The internal.h file is renamed to s390x-internal.h, because of the
> risk of collision with other files with the same name.
>
> After the reshuffling, update MAINTAINERS accordingly.
> Make use of the new directory:
>
> target/s390x/tcg/

(...)

> diff --git a/MAINTAINERS b/MAINTAINERS
> index 636bf2f536..d05dcc22e0 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -294,7 +294,7 @@ S390 TCG CPUs
>  M: Richard Henderson 
>  M: David Hildenbrand 
>  S: Maintained
> -F: target/s390x/
> +F: target/s390x/tcg
>  F: hw/s390x/
>  F: disas/s390.c
>  F: tests/tcg/s390x/

This means that the pattern for tcg won't cover those files anymore that
are relevant for both tcg and kvm (e.g. cpu models). Maybe those files
need to be enumerated? Or keep the old pattern?



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

2021-06-22 Thread Al Cho
Yes, it should be "sysemu", it's a typo.

From: Cornelia Huck 
Sent: Tuesday, June 22, 2021 7:42 PM
To: Al Cho ; qemu-devel@nongnu.org ; 
qemu-s3...@nongnu.org 
Cc: Claudio Fontana ; Al Cho ; Claudio 
Fontana 
Subject: Re: [RFC v5 09/13] target/s390x: make helper.c sysemu-only

On Tue, Jun 22 2021, "Cho, Yu-Chen"  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 
> Signed-off-by: Cho, Yu-Chen 
> Acked-by: Cornelia Huck 
> ---
>  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 00/13] s390x cleanup

2021-06-22 Thread Al Cho
There is the CI/CD result of this patches set

https://gitlab.com/alcho.tw/qemu/-/pipelines/324863789

Cheers,
AL


From: Al Cho 
Sent: Tuesday, June 22, 2021 6:17 PM
To: qemu-devel@nongnu.org ; qemu-s3...@nongnu.org 

Cc: Claudio Fontana ; Al Cho 
Subject: [RFC v5 00/13] s390x cleanup

this is the next version of a cleanup series for s390x.

v4 -> v5:
* "target/s390x: start moving TCG-only code to tcg/"
  - add change to MAINTAINERS file

* "target/s390x: move sysemu-only code out to cpu-sysemu.c"
  - make use of SysemuCPUOps s390_sysemu_ops to handle

* "target/s390x: split cpu-dump from helper.c"
  - add description to explain why split cpu-dump from helper.c

* "target/s390x: make helper.c sysemu-only" #9
  - mention at the beginning of this file that this is sysemu only
(Cornelia)

* "target/s390x: remove kvm-stub.c"
  - add additional comment to explain the function can be
removed (Thomas)

* "target/s390x: move kvm files into kvm/"
   - add change to MAINTAINERS file

* "target/s390x: split sysemu part of cpu models"
   - add change to MAINTAINERS file

* "MAINTAINERS: update s390x directories"
  - removed, squash this in respectively:
#6 target/s390x: start moving TCG-only code to tcg/
#12 target/s390x: move kvm files into kvm/
#13 target/s390x: split sysemu part of cpu models

v3 -> v4: take s390x part from Claudio and modify for the current master

* "target/s390x: meson: add target_user_arch"
  - new patch, add target_user_arch to avoid the proliferation of #ifdef
in target code.

v2 -> v3: minor changes

* "hw/s390x: rename tod-qemu.c to tod-tcg.c": move to the front (David)

* "hw/s390x: only build tod-qemu from the CONFIG_TCG build"
  - move just after, use "tod-tcg" instead

* "hw/s390x: tod: make explicit checks for accelerators when initializing"
  - removed a line break in commit message

* "target/s390x: start moving TCG-only code to tcg/"
  - split the rename s390x-internal.h rename part, do it before the move

* "target/s390x: move kvm files into kvm/"
  - fix broken/missing move of trace events


Cho, Yu-Chen (13):
  target/s390x: meson: add target_user_arch
  hw/s390x: rename tod-qemu.c to tod-tcg.c
  hw/s390x: only build tod-tcg from the CONFIG_TCG build
  hw/s390x: tod: make explicit checks for accelerators when initializing
  target/s390x: remove tcg-stub.c
  target/s390x: start moving TCG-only code to tcg/
  target/s390x: move sysemu-only code out to cpu-sysemu.c
  target/s390x: split cpu-dump from helper.c
  target/s390x: make helper.c sysemu-only
  target/s390x: use kvm_enabled() to wrap call to kvm_s390_get_hpage_1m
  target/s390x: remove kvm-stub.c
  target/s390x: move kvm files into kvm/
  target/s390x: split sysemu part of cpu models

 MAINTAINERS   |   7 +-
 hw/intc/s390_flic_kvm.c   |   2 +-
 hw/s390x/meson.build  |   4 +-
 hw/s390x/s390-stattrib-kvm.c  |   2 +-
 hw/s390x/tod-kvm.c|   2 +-
 hw/s390x/{tod-qemu.c => tod-tcg.c}|   2 +-
 hw/s390x/tod.c|   9 +-
 hw/vfio/ap.c  |   2 +-
 include/hw/s390x/tod.h|   2 +-
 meson.build   |   1 +
 target/s390x/arch_dump.c  |   2 +-
 target/s390x/cpu-dump.c   | 131 ++
 target/s390x/cpu-sysemu.c | 309 +
 target/s390x/cpu.c| 289 +---
 target/s390x/cpu_models.c | 421 +
 target/s390x/cpu_models_sysemu.c  | 426 ++
 target/s390x/cpu_models_user.c|  20 +
 target/s390x/diag.c   |   7 +-
 target/s390x/gdbstub.c|   2 +-
 target/s390x/helper.c | 115 +
 target/s390x/interrupt.c  |   6 +-
 target/s390x/ioinst.c |   2 +-
 target/s390x/kvm-stub.c   | 126 --
 target/s390x/{ => kvm}/kvm.c  |   4 +-
 target/s390x/{ => kvm}/kvm_s390x.h|   0
 target/s390x/kvm/meson.build  |  17 +
 target/s390x/kvm/trace-events |   7 +
 target/s390x/kvm/trace.h  |   1 +
 target/s390x/machine.c|   6 +-
 target/s390x/meson.build  |  42 +-
 target/s390x/mmu_helper.c |   4 +-
 target/s390x/{internal.h => s390x-internal.h} |   8 +
 target/s390x/sigp.c   |   2 +-
 target/s390x/tcg-stub.c   |  30 --
 target/s390x/{ => tcg}/cc_helper.c|   2 +-
 target/s390x/{ => 

Re: latest GOOD state of series i386 cleanup, arm cleanup, s390 cleanup

2021-05-17 Thread Al Cho via
Hi Claudio,

> https://gitlab.com/hw-claudio/qemu/-/pipelines/293603379
>
> https://github.com/qemu/qemu.git branch "s390_cleanup_v1"
>
> Al, can you take this one to the finish line?

Yes, I will take it.

Cheers,
 AL

From: Claudio Fontana 
Sent: Monday, May 17, 2021 5:54 PM
To: Richard Henderson ; Philippe Mathieu-Daudé 
; Paolo Bonzini ; Peter Maydell 

Cc: qemu-devel ; Al Cho ; Liang Yan 
; Alex Bennee 
Subject: Re: latest GOOD state of series i386 cleanup, arm cleanup, s390 cleanup

On 5/17/21 11:53 AM, Claudio Fontana wrote:
> Hello all,
>
> due to my inactivity for a few weeks coupled likely with the upstream 
> processes around qemu-6.0 now the series:
>
> 1) i386 cleanup
> 2) arm cleanup and experimental kvm-only build
> 3) s390 cleanup
>
> have become stale and hard to rebase on latest master.
> This effect is compounded by the fact that lots of broken tests in master 
> have been added.
>
> In the interest of not losing work,
> I provide here the latest known good state of these series:
>
> For the i386 cleanup:
> https://gitlab.com/hw-claudio/qemu/-/pipelines/293603386
>
> Tests started breaking horribly since about 1/2 weeks.
> The latest version of the cleanup is reachable here:
>
> https://github.com/qemu/qemu.git branch "i386_cleanup_9"
>
> In my understanding, Paolo has now picked up this one.
>
> For the ARM cleanup and experimental kvm-only build:
>
> https://gitlab.com/hw-claudio/qemu/-/pipelines/293603376
>
> https://github.com/qemu/qemu.git branch "arm_cleanup_v15"
>
> Again here tests started misbehaving in the same timeframe.
>
> The state of ARM cleanup is still experimental, maybe Liang or Philippe you 
> can adopt this one?
>
> For the s390x cleanup:
>
> https://gitlab.com/hw-claudio/qemu/-/pipelines/293603379
>
> https://github.com/qemu/qemu.git branch "s390_cleanup_v1"
>
> Al, can you take this one to the finish line?
>
> Thanks,
>
> Claudio
>

Adding also Alex Bennee in Cc:

Thanks,

Claudio