| Message ID | 20240705084047.857176-21-alex.bennee@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | July maintainer updates (32bit, testing, plugins, gdbstub) | expand |
On 05/07/2024 10.40, Alex Bennée wrote: > In fact any other accelerator would be pointless as the point is to > exercise the TCI accelerator anyway. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > .gitlab-ci.d/buildtest.yml | 2 +- > .gitlab-ci.d/crossbuilds.yml | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Thomas Huth <thuth@redhat.com>
On 5/7/24 10:40, Alex Bennée wrote: > In fact any other accelerator would be pointless as the point is to > exercise the TCI accelerator anyway. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > .gitlab-ci.d/buildtest.yml | 2 +- > .gitlab-ci.d/crossbuilds.yml | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml > index 425fc6479b..e3a0758bd9 100644 > --- a/.gitlab-ci.d/buildtest.yml > +++ b/.gitlab-ci.d/buildtest.yml > @@ -635,7 +635,7 @@ build-tci: > - TARGETS="aarch64 arm hppa m68k microblaze ppc64 s390x x86_64" > - mkdir build > - cd build > - - ../configure --enable-tcg-interpreter --disable-docs --disable-gtk --disable-vnc > + - ../configure --enable-tcg-interpreter --disable-kvm --disable-docs --disable-gtk --disable-vnc Shouldn't we also disable the other accelerators for completeness? > --target-list="$(for tg in $TARGETS; do echo -n ${tg}'-softmmu '; done)" > || { cat config.log meson-logs/meson-log.txt && exit 1; } > - make -j"$JOBS" > diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml > index 3de0341afe..cb499e4ee0 100644 > --- a/.gitlab-ci.d/crossbuilds.yml > +++ b/.gitlab-ci.d/crossbuilds.yml > @@ -68,7 +68,7 @@ cross-i686-tci: > variables: > IMAGE: debian-i686-cross > ACCEL: tcg-interpreter > - EXTRA_CONFIGURE_OPTS: --target-list=i386-softmmu,i386-linux-user,aarch64-softmmu,aarch64-linux-user,ppc-softmmu,ppc-linux-user --disable-plugins > + EXTRA_CONFIGURE_OPTS: --target-list=i386-softmmu,i386-linux-user,aarch64-softmmu,aarch64-linux-user,ppc-softmmu,ppc-linux-user --disable-plugins --disable-kvm > MAKE_CHECK_ARGS: check check-tcg > > cross-mipsel-system:
On 05/07/2024 18.34, Philippe Mathieu-Daudé wrote: > On 5/7/24 10:40, Alex Bennée wrote: >> In fact any other accelerator would be pointless as the point is to >> exercise the TCI accelerator anyway. >> >> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> >> --- >> .gitlab-ci.d/buildtest.yml | 2 +- >> .gitlab-ci.d/crossbuilds.yml | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml >> index 425fc6479b..e3a0758bd9 100644 >> --- a/.gitlab-ci.d/buildtest.yml >> +++ b/.gitlab-ci.d/buildtest.yml >> @@ -635,7 +635,7 @@ build-tci: >> - TARGETS="aarch64 arm hppa m68k microblaze ppc64 s390x x86_64" >> - mkdir build >> - cd build >> - - ../configure --enable-tcg-interpreter --disable-docs --disable-gtk >> --disable-vnc >> + - ../configure --enable-tcg-interpreter --disable-kvm --disable-docs >> --disable-gtk --disable-vnc > > Shouldn't we also disable the other accelerators for completeness? No, this is a Linux machine, and there's only TCG and KVM available for Linux. No need to bother with the other accelerators here. Thomas
On 5/7/24 18:49, Thomas Huth wrote: > On 05/07/2024 18.34, Philippe Mathieu-Daudé wrote: >> On 5/7/24 10:40, Alex Bennée wrote: >>> In fact any other accelerator would be pointless as the point is to >>> exercise the TCI accelerator anyway. >>> >>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> >>> --- >>> .gitlab-ci.d/buildtest.yml | 2 +- >>> .gitlab-ci.d/crossbuilds.yml | 2 +- >>> 2 files changed, 2 insertions(+), 2 deletions(-) >>> >>> diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml >>> index 425fc6479b..e3a0758bd9 100644 >>> --- a/.gitlab-ci.d/buildtest.yml >>> +++ b/.gitlab-ci.d/buildtest.yml >>> @@ -635,7 +635,7 @@ build-tci: >>> - TARGETS="aarch64 arm hppa m68k microblaze ppc64 s390x x86_64" >>> - mkdir build >>> - cd build >>> - - ../configure --enable-tcg-interpreter --disable-docs >>> --disable-gtk --disable-vnc >>> + - ../configure --enable-tcg-interpreter --disable-kvm >>> --disable-docs --disable-gtk --disable-vnc >> >> Shouldn't we also disable the other accelerators for completeness? > > No, this is a Linux machine, and there's only TCG and KVM available for > Linux. No need to bother with the other accelerators here. I noticed this is Linux. If for some reason the Xen libs get installed, Xen accel will be enabled. Explicit would be: --enable-tcg --enable-tcg-interpreter --disable-kvm --disable-xen But I won't insist. Anyhow Alex sent his pull request. Regards, Phil.
On 05/07/2024 23.44, Philippe Mathieu-Daudé wrote: > On 5/7/24 18:49, Thomas Huth wrote: >> On 05/07/2024 18.34, Philippe Mathieu-Daudé wrote: >>> On 5/7/24 10:40, Alex Bennée wrote: >>>> In fact any other accelerator would be pointless as the point is to >>>> exercise the TCI accelerator anyway. >>>> >>>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> >>>> --- >>>> .gitlab-ci.d/buildtest.yml | 2 +- >>>> .gitlab-ci.d/crossbuilds.yml | 2 +- >>>> 2 files changed, 2 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml >>>> index 425fc6479b..e3a0758bd9 100644 >>>> --- a/.gitlab-ci.d/buildtest.yml >>>> +++ b/.gitlab-ci.d/buildtest.yml >>>> @@ -635,7 +635,7 @@ build-tci: >>>> - TARGETS="aarch64 arm hppa m68k microblaze ppc64 s390x x86_64" >>>> - mkdir build >>>> - cd build >>>> - - ../configure --enable-tcg-interpreter --disable-docs >>>> --disable-gtk --disable-vnc >>>> + - ../configure --enable-tcg-interpreter --disable-kvm >>>> --disable-docs --disable-gtk --disable-vnc >>> >>> Shouldn't we also disable the other accelerators for completeness? >> >> No, this is a Linux machine, and there's only TCG and KVM available for >> Linux. No need to bother with the other accelerators here. > > I noticed this is Linux. If for some reason the Xen libs get installed, > Xen accel will be enabled. Explicit would be: > > --enable-tcg --enable-tcg-interpreter --disable-kvm --disable-xen > > But I won't insist. Anyhow Alex sent his pull request. Oh, drat, I somehow only had the hvf and whpx accelerators in mind... You're right, --disable-xen is certainly a good idea here, too: https://gitlab.com/qemu-project/qemu/-/jobs/7281510036#L583 Mind to send a patch on top of the previous one? Thomas
diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 425fc6479b..e3a0758bd9 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -635,7 +635,7 @@ build-tci: - TARGETS="aarch64 arm hppa m68k microblaze ppc64 s390x x86_64" - mkdir build - cd build - - ../configure --enable-tcg-interpreter --disable-docs --disable-gtk --disable-vnc + - ../configure --enable-tcg-interpreter --disable-kvm --disable-docs --disable-gtk --disable-vnc --target-list="$(for tg in $TARGETS; do echo -n ${tg}'-softmmu '; done)" || { cat config.log meson-logs/meson-log.txt && exit 1; } - make -j"$JOBS" diff --git a/.gitlab-ci.d/crossbuilds.yml b/.gitlab-ci.d/crossbuilds.yml index 3de0341afe..cb499e4ee0 100644 --- a/.gitlab-ci.d/crossbuilds.yml +++ b/.gitlab-ci.d/crossbuilds.yml @@ -68,7 +68,7 @@ cross-i686-tci: variables: IMAGE: debian-i686-cross ACCEL: tcg-interpreter - EXTRA_CONFIGURE_OPTS: --target-list=i386-softmmu,i386-linux-user,aarch64-softmmu,aarch64-linux-user,ppc-softmmu,ppc-linux-user --disable-plugins + EXTRA_CONFIGURE_OPTS: --target-list=i386-softmmu,i386-linux-user,aarch64-softmmu,aarch64-linux-user,ppc-softmmu,ppc-linux-user --disable-plugins --disable-kvm MAKE_CHECK_ARGS: check check-tcg cross-mipsel-system:
In fact any other accelerator would be pointless as the point is to exercise the TCI accelerator anyway. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- .gitlab-ci.d/buildtest.yml | 2 +- .gitlab-ci.d/crossbuilds.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)