[PULL 00/11] rc2 fixes (check-tcg, gitlab, gdbstub)

Alex Bennée posted 11 patches 1 week ago
Test checkpatch passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20210406150041.28753-1-alex.bennee@linaro.org
docs/system/gdb.rst                     | 63 ++++++++++++++++++++++++++++++++-
configure                               |  2 +-
.gitlab-ci.yml                          |  4 +--
tests/docker/Makefile.include           |  5 ++-
tests/docker/dockerfiles/centos8.docker |  1 +
tests/tcg/configure.sh                  | 42 +++++++++++++++++++---
tests/tcg/i386/Makefile.target          | 16 +++++++--
tests/tcg/i386/system/kernel.ld         |  2 +-
tests/tcg/multiarch/gdbstub/sha1.py     |  5 ++-
9 files changed, 126 insertions(+), 14 deletions(-)

[PULL 00/11] rc2 fixes (check-tcg, gitlab, gdbstub)

Posted by Alex Bennée 1 week ago
The following changes since commit 109918d24a3bb9ed3d05beb34ea4ac6be443c138:

  Merge remote-tracking branch 'remotes/nvme/tags/nvme-fixes-for-6.0-pull-request' into staging (2021-04-05 22:15:38 +0100)

are available in the Git repository at:

  https://github.com/stsquad/qemu.git tags/pull-6.0-rc2-fixes-060421-1

for you to fetch changes up to a2e5bbf0c407a572d9b687adaecf9995f66b4cd9:

  gitlab-ci.yml: Test the dtrace backend in one of the jobs (2021-04-06 15:04:50 +0100)

----------------------------------------------------------------
Testing updates:

  - fix x86_64 cross compilers
  - don't use registry for non-x86 containers
  - add valid host types for given cross compile containers
  - clean up i386 code16 test with explicit -no-pie
  - relax sha1.py gdbstub test
  - add more gdbstub documentation
  - remove annoying warning on gitlab
  - test dtrace backend in gitlab

----------------------------------------------------------------
Alex Bennée (7):
      tests/tcg: update the defaults for x86 compilers
      tests/docker: don't set DOCKER_REGISTRY on non-x86_64
      tests/tcg: add concept of container_hosts
      tests/tcg/configure.sh: make sure we pick up x86_64 cross compilers
      tests/tcg/i386: expand .data sections for system tests
      tests/tcg/i386: force -fno-pie for test-i386
      tests/tcg: relax the next step precision of the gdb sha1 test

Peter Maydell (2):
      docs/system/gdb.rst: Add some more heading structure
      docs/system/gdb.rst: Document how to debug multicore machines

Thomas Huth (2):
      gitlab-ci.yml: Fix the filtering for the git submodules
      gitlab-ci.yml: Test the dtrace backend in one of the jobs

 docs/system/gdb.rst                     | 63 ++++++++++++++++++++++++++++++++-
 configure                               |  2 +-
 .gitlab-ci.yml                          |  4 +--
 tests/docker/Makefile.include           |  5 ++-
 tests/docker/dockerfiles/centos8.docker |  1 +
 tests/tcg/configure.sh                  | 42 +++++++++++++++++++---
 tests/tcg/i386/Makefile.target          | 16 +++++++--
 tests/tcg/i386/system/kernel.ld         |  2 +-
 tests/tcg/multiarch/gdbstub/sha1.py     |  5 ++-
 9 files changed, 126 insertions(+), 14 deletions(-)

-- 
2.20.1


Re: [PULL 00/11] rc2 fixes (check-tcg, gitlab, gdbstub)

Posted by Peter Maydell 1 week ago
On Tue, 6 Apr 2021 at 16:00, Alex Bennée <alex.bennee@linaro.org> wrote:
>
> The following changes since commit 109918d24a3bb9ed3d05beb34ea4ac6be443c138:
>
>   Merge remote-tracking branch 'remotes/nvme/tags/nvme-fixes-for-6.0-pull-request' into staging (2021-04-05 22:15:38 +0100)
>
> are available in the Git repository at:
>
>   https://github.com/stsquad/qemu.git tags/pull-6.0-rc2-fixes-060421-1
>
> for you to fetch changes up to a2e5bbf0c407a572d9b687adaecf9995f66b4cd9:
>
>   gitlab-ci.yml: Test the dtrace backend in one of the jobs (2021-04-06 15:04:50 +0100)
>
> ----------------------------------------------------------------
> Testing updates:
>
>   - fix x86_64 cross compilers
>   - don't use registry for non-x86 containers
>   - add valid host types for given cross compile containers
>   - clean up i386 code16 test with explicit -no-pie
>   - relax sha1.py gdbstub test
>   - add more gdbstub documentation
>   - remove annoying warning on gitlab
>   - test dtrace backend in gitlab
>
> ----------------------------------------------------------------

The merge for this failed in gitlab CI with a weird state:

https://gitlab.com/qemu-project/qemu/-/pipelines/282228325

 * marked "failed"
 * but has a "cancel" button
 * has no "retry" button
 * has an "error" tag whose hover-over text reads "Pipeline job activity
   limit exceeded!"

Not being sure whether this is gitlab CI being flaky again or a problem
with something in the pullreq, I've not applied it for rc2; we can
figure out what happened and maybe try again for rc3.

thanks
-- PMM

Re: [PULL 00/11] rc2 fixes (check-tcg, gitlab, gdbstub)

Posted by Alex Bennée 6 days, 14 hours ago
Peter Maydell <peter.maydell@linaro.org> writes:

> On Tue, 6 Apr 2021 at 16:00, Alex Bennée <alex.bennee@linaro.org> wrote:
>>
>> The following changes since commit 109918d24a3bb9ed3d05beb34ea4ac6be443c138:
>>
>>   Merge remote-tracking branch 'remotes/nvme/tags/nvme-fixes-for-6.0-pull-request' into staging (2021-04-05 22:15:38 +0100)
>>
>> are available in the Git repository at:
>>
>>   https://github.com/stsquad/qemu.git tags/pull-6.0-rc2-fixes-060421-1
>>
>> for you to fetch changes up to a2e5bbf0c407a572d9b687adaecf9995f66b4cd9:
>>
>>   gitlab-ci.yml: Test the dtrace backend in one of the jobs (2021-04-06 15:04:50 +0100)
>>
>> ----------------------------------------------------------------
>> Testing updates:
>>
>>   - fix x86_64 cross compilers
>>   - don't use registry for non-x86 containers
>>   - add valid host types for given cross compile containers
>>   - clean up i386 code16 test with explicit -no-pie
>>   - relax sha1.py gdbstub test
>>   - add more gdbstub documentation
>>   - remove annoying warning on gitlab
>>   - test dtrace backend in gitlab
>>
>> ----------------------------------------------------------------
>
> The merge for this failed in gitlab CI with a weird state:
>
> https://gitlab.com/qemu-project/qemu/-/pipelines/282228325
>
>  * marked "failed"
>  * but has a "cancel" button
>  * has no "retry" button
>  * has an "error" tag whose hover-over text reads "Pipeline job activity
>    limit exceeded!"
>
> Not being sure whether this is gitlab CI being flaky again or a problem
> with something in the pullreq, I've not applied it for rc2; we can
> figure out what happened and maybe try again for rc3.

I think it's GitLab going nuts because:

  https://gitlab.com/stsquad/qemu/-/pipelines/282304522 is all green
  https://gitlab.com/stsquad/qemu/-/pipelines/282619235 is a dumpster fire
  
And they are both the same commit (pull-6.0-rc2-fixes-070421-2)

>
> thanks
> -- PMM


-- 
Alex Bennée

Re: [PULL 00/11] rc2 fixes (check-tcg, gitlab, gdbstub)

Posted by Peter Maydell 6 days, 13 hours ago
On Wed, 7 Apr 2021 at 18:26, Alex Bennée <alex.bennee@linaro.org> wrote:
>
>
> Peter Maydell <peter.maydell@linaro.org> writes:
>
> > On Tue, 6 Apr 2021 at 16:00, Alex Bennée <alex.bennee@linaro.org> wrote:
> >>
> >> The following changes since commit 109918d24a3bb9ed3d05beb34ea4ac6be443c138:
> >>
> >>   Merge remote-tracking branch 'remotes/nvme/tags/nvme-fixes-for-6.0-pull-request' into staging (2021-04-05 22:15:38 +0100)
> >>
> >> are available in the Git repository at:
> >>
> >>   https://github.com/stsquad/qemu.git tags/pull-6.0-rc2-fixes-060421-1
> >>
> >> for you to fetch changes up to a2e5bbf0c407a572d9b687adaecf9995f66b4cd9:
> >>
> >>   gitlab-ci.yml: Test the dtrace backend in one of the jobs (2021-04-06 15:04:50 +0100)
> >>
> >> ----------------------------------------------------------------
> >> Testing updates:
> >>
> >>   - fix x86_64 cross compilers
> >>   - don't use registry for non-x86 containers
> >>   - add valid host types for given cross compile containers
> >>   - clean up i386 code16 test with explicit -no-pie
> >>   - relax sha1.py gdbstub test
> >>   - add more gdbstub documentation
> >>   - remove annoying warning on gitlab
> >>   - test dtrace backend in gitlab
> >>
> >> ----------------------------------------------------------------
> >
> > The merge for this failed in gitlab CI with a weird state:
> >
> > https://gitlab.com/qemu-project/qemu/-/pipelines/282228325
> >
> >  * marked "failed"
> >  * but has a "cancel" button
> >  * has no "retry" button
> >  * has an "error" tag whose hover-over text reads "Pipeline job activity
> >    limit exceeded!"
> >
> > Not being sure whether this is gitlab CI being flaky again or a problem
> > with something in the pullreq, I've not applied it for rc2; we can
> > figure out what happened and maybe try again for rc3.
>
> I think it's GitLab going nuts because:
>
>   https://gitlab.com/stsquad/qemu/-/pipelines/282304522 is all green
>   https://gitlab.com/stsquad/qemu/-/pipelines/282619235 is a dumpster fire
>
> And they are both the same commit (pull-6.0-rc2-fixes-070421-2)

Should I retry a merge of this pullreq (which is -1), or are you going to
submit a new one ?

thanks
-- PMM

Re: [PULL 00/11] rc2 fixes (check-tcg, gitlab, gdbstub)

Posted by Alex Bennée 6 days, 12 hours ago
Peter Maydell <peter.maydell@linaro.org> writes:

> On Wed, 7 Apr 2021 at 18:26, Alex Bennée <alex.bennee@linaro.org> wrote:
>>
>>
>> Peter Maydell <peter.maydell@linaro.org> writes:
>>
>> > On Tue, 6 Apr 2021 at 16:00, Alex Bennée <alex.bennee@linaro.org> wrote:
>> >>
>> >> The following changes since commit 109918d24a3bb9ed3d05beb34ea4ac6be443c138:
>> >>
>> >>   Merge remote-tracking branch 'remotes/nvme/tags/nvme-fixes-for-6.0-pull-request' into staging (2021-04-05 22:15:38 +0100)
>> >>
>> >> are available in the Git repository at:
>> >>
>> >>   https://github.com/stsquad/qemu.git tags/pull-6.0-rc2-fixes-060421-1
>> >>
>> >> for you to fetch changes up to a2e5bbf0c407a572d9b687adaecf9995f66b4cd9:
>> >>
>> >>   gitlab-ci.yml: Test the dtrace backend in one of the jobs (2021-04-06 15:04:50 +0100)
>> >>
>> >> ----------------------------------------------------------------
>> >> Testing updates:
>> >>
>> >>   - fix x86_64 cross compilers
>> >>   - don't use registry for non-x86 containers
>> >>   - add valid host types for given cross compile containers
>> >>   - clean up i386 code16 test with explicit -no-pie
>> >>   - relax sha1.py gdbstub test
>> >>   - add more gdbstub documentation
>> >>   - remove annoying warning on gitlab
>> >>   - test dtrace backend in gitlab
>> >>
>> >> ----------------------------------------------------------------
>> >
>> > The merge for this failed in gitlab CI with a weird state:
>> >
>> > https://gitlab.com/qemu-project/qemu/-/pipelines/282228325
>> >
>> >  * marked "failed"
>> >  * but has a "cancel" button
>> >  * has no "retry" button
>> >  * has an "error" tag whose hover-over text reads "Pipeline job activity
>> >    limit exceeded!"
>> >
>> > Not being sure whether this is gitlab CI being flaky again or a problem
>> > with something in the pullreq, I've not applied it for rc2; we can
>> > figure out what happened and maybe try again for rc3.
>>
>> I think it's GitLab going nuts because:
>>
>>   https://gitlab.com/stsquad/qemu/-/pipelines/282304522 is all green
>>   https://gitlab.com/stsquad/qemu/-/pipelines/282619235 is a dumpster fire
>>
>> And they are both the same commit (pull-6.0-rc2-fixes-070421-2)
>
> Should I retry a merge of this pullreq (which is -1), or are you going to
> submit a new one ?

I think either is good, the -2 tag was simply a re-base and has at least
one clean run before everything went weird.

>
> thanks
> -- PMM


-- 
Alex Bennée

Re: [PULL 00/11] rc2 fixes (check-tcg, gitlab, gdbstub)

Posted by Peter Maydell 5 days, 18 hours ago
On Wed, 7 Apr 2021 at 19:42, Alex Bennée <alex.bennee@linaro.org> wrote:
>
>
> Peter Maydell <peter.maydell@linaro.org> writes:
>
> > On Wed, 7 Apr 2021 at 18:26, Alex Bennée <alex.bennee@linaro.org> wrote:
> >>
> >>
> >> Peter Maydell <peter.maydell@linaro.org> writes:
> >>
> >> > On Tue, 6 Apr 2021 at 16:00, Alex Bennée <alex.bennee@linaro.org> wrote:
> >> >>
> >> >> The following changes since commit 109918d24a3bb9ed3d05beb34ea4ac6be443c138:
> >> >>
> >> >>   Merge remote-tracking branch 'remotes/nvme/tags/nvme-fixes-for-6.0-pull-request' into staging (2021-04-05 22:15:38 +0100)
> >> >>
> >> >> are available in the Git repository at:
> >> >>
> >> >>   https://github.com/stsquad/qemu.git tags/pull-6.0-rc2-fixes-060421-1
> >> >>
> >> >> for you to fetch changes up to a2e5bbf0c407a572d9b687adaecf9995f66b4cd9:
> >> >>
> >> >>   gitlab-ci.yml: Test the dtrace backend in one of the jobs (2021-04-06 15:04:50 +0100)
> >> >>
> >> >> ----------------------------------------------------------------
> >> >> Testing updates:
> >> >>
> >> >>   - fix x86_64 cross compilers
> >> >>   - don't use registry for non-x86 containers
> >> >>   - add valid host types for given cross compile containers
> >> >>   - clean up i386 code16 test with explicit -no-pie
> >> >>   - relax sha1.py gdbstub test
> >> >>   - add more gdbstub documentation
> >> >>   - remove annoying warning on gitlab
> >> >>   - test dtrace backend in gitlab
> >> >>
> >> >> ----------------------------------------------------------------
> >> >
> >> > The merge for this failed in gitlab CI with a weird state:
> >> >
> >> > https://gitlab.com/qemu-project/qemu/-/pipelines/282228325
> >> >
> >> >  * marked "failed"
> >> >  * but has a "cancel" button
> >> >  * has no "retry" button
> >> >  * has an "error" tag whose hover-over text reads "Pipeline job activity
> >> >    limit exceeded!"
> >> >
> >> > Not being sure whether this is gitlab CI being flaky again or a problem
> >> > with something in the pullreq, I've not applied it for rc2; we can
> >> > figure out what happened and maybe try again for rc3.
> >>
> >> I think it's GitLab going nuts because:
> >>
> >>   https://gitlab.com/stsquad/qemu/-/pipelines/282304522 is all green
> >>   https://gitlab.com/stsquad/qemu/-/pipelines/282619235 is a dumpster fire
> >>
> >> And they are both the same commit (pull-6.0-rc2-fixes-070421-2)
> >
> > Should I retry a merge of this pullreq (which is -1), or are you going to
> > submit a new one ?
>
> I think either is good, the -2 tag was simply a re-base and has at least
> one clean run before everything went weird.

Yep, it seemed happier on a second run so I've merged this (using the -1
tag; -2 isn't a signed tag).


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/6.0
for any user-visible changes.

-- PMM