| Message ID | 20210723170354.18975-1-alex.bennee@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 7/23/21 7:03 PM, Alex Bennée wrote: > I realised I'm on holiday next week so I thought I'd better send this now. > > The following changes since commit a146af86c8247f41b641783428b95ee71eb0e43f: > > Merge remote-tracking branch 'remotes/kraxel/tags/vga-20210723-pull-request' into staging (2021-07-23 12:16:12 +0100) > > are available in the Git repository at: > > https://github.com/stsquad/qemu.git tags/pull-for-6.1-rc1-230721-1 > > for you to fetch changes up to 0a9487d80af9ed6fa14d2696bc34a920b32e53e5: > > gitlab-ci: Extract OpenSBI job rules to reusable section (2021-07-23 17:22:16 +0100) > > ---------------------------------------------------------------- > Doc, metadata, plugin and testing updates for 6.1-rc1: > > - git ignore some file editor detritus > - add overview on device emulation terminology > - remove needless if leg in configure custom devices logic > - numerous gitdm/mailmap updates > - fix plugin_exit race for linux-user > - fix a few bugs in cache modelling plugin > - fix plugin calculation of physical address > - handle pure assembler/linker tcg tests outside of docker > - add tricore build to gitlab > - remove superfluous MacOSX task > - generalise the OpenBSI gitlab rules > > ---------------------------------------------------------------- > Philippe Mathieu-Daudé (1): > gitlab-ci: Extract OpenSBI job rules to reusable section Oops this isn't to latest version of this patch :/ https://lists.gnu.org/archive/html/qemu-devel/2021-07/msg06130.html
On Fri, 23 Jul 2021 at 18:44, Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > On 7/23/21 7:03 PM, Alex Bennée wrote: > > I realised I'm on holiday next week so I thought I'd better send this now. > > > > The following changes since commit a146af86c8247f41b641783428b95ee71eb0e43f: > > > > Merge remote-tracking branch 'remotes/kraxel/tags/vga-20210723-pull-request' into staging (2021-07-23 12:16:12 +0100) > > > > are available in the Git repository at: > > > > https://github.com/stsquad/qemu.git tags/pull-for-6.1-rc1-230721-1 > > > > for you to fetch changes up to 0a9487d80af9ed6fa14d2696bc34a920b32e53e5: > > > > gitlab-ci: Extract OpenSBI job rules to reusable section (2021-07-23 17:22:16 +0100) > > > > ---------------------------------------------------------------- > > Doc, metadata, plugin and testing updates for 6.1-rc1: > > > > - git ignore some file editor detritus > > - add overview on device emulation terminology > > - remove needless if leg in configure custom devices logic > > - numerous gitdm/mailmap updates > > - fix plugin_exit race for linux-user > > - fix a few bugs in cache modelling plugin > > - fix plugin calculation of physical address > > - handle pure assembler/linker tcg tests outside of docker > > - add tricore build to gitlab > > - remove superfluous MacOSX task > > - generalise the OpenBSI gitlab rules > > > > ---------------------------------------------------------------- > > > > Philippe Mathieu-Daudé (1): > > gitlab-ci: Extract OpenSBI job rules to reusable section > > Oops this isn't to latest version of this patch :/ > > https://lists.gnu.org/archive/html/qemu-devel/2021-07/msg06130.html Given Alex is on holiday, should I apply this pullreq anyway and then you could send a patch to fix up the differences afterwards, or should we drop the pullreq (and maybe this stuff doesn't go in for rc1)? -- PMM
On Sat, Jul 24, 2021 at 11:04:03AM +0100, Peter Maydell wrote: > On Fri, 23 Jul 2021 at 18:44, Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > > > On 7/23/21 7:03 PM, Alex Bennée wrote: > > > I realised I'm on holiday next week so I thought I'd better send this now. > > > > > > The following changes since commit a146af86c8247f41b641783428b95ee71eb0e43f: > > > > > > Merge remote-tracking branch 'remotes/kraxel/tags/vga-20210723-pull-request' into staging (2021-07-23 12:16:12 +0100) > > > > > > are available in the Git repository at: > > > > > > https://github.com/stsquad/qemu.git tags/pull-for-6.1-rc1-230721-1 > > > > > > for you to fetch changes up to 0a9487d80af9ed6fa14d2696bc34a920b32e53e5: > > > > > > gitlab-ci: Extract OpenSBI job rules to reusable section (2021-07-23 17:22:16 +0100) > > > > > > ---------------------------------------------------------------- > > > Doc, metadata, plugin and testing updates for 6.1-rc1: > > > > > > - git ignore some file editor detritus > > > - add overview on device emulation terminology > > > - remove needless if leg in configure custom devices logic > > > - numerous gitdm/mailmap updates > > > - fix plugin_exit race for linux-user > > > - fix a few bugs in cache modelling plugin > > > - fix plugin calculation of physical address > > > - handle pure assembler/linker tcg tests outside of docker > > > - add tricore build to gitlab > > > - remove superfluous MacOSX task > > > - generalise the OpenBSI gitlab rules > > > > > > ---------------------------------------------------------------- > > > > > > > Philippe Mathieu-Daudé (1): > > > gitlab-ci: Extract OpenSBI job rules to reusable section > > > > Oops this isn't to latest version of this patch :/ > > > > https://lists.gnu.org/archive/html/qemu-devel/2021-07/msg06130.html > > Given Alex is on holiday, should I apply this pullreq anyway and > then you could send a patch to fix up the differences afterwards, > or should we drop the pullreq (and maybe this stuff doesn't > go in for rc1)? I think it is fine to apply the pullreq anyway. While there is a bug in the OpenSBI job rules patch, it is still better than what currently exists in git master. We've also already merged the identical rules change into the EDK job. So no matter what we'll need to followup later with more fixes. The bug in the patch merely means that if the container build fails, we'll then still try the next build job which will now also possibly fail. This is annoying but functionally harmless, as the overall pipeline will be in a fail state no matter what. Regards, Daniel
On Mon, 26 Jul 2021 at 09:45, Daniel P. Berrangé <berrange@redhat.com> wrote: > > On Sat, Jul 24, 2021 at 11:04:03AM +0100, Peter Maydell wrote: > > On Fri, 23 Jul 2021 at 18:44, Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > > > > > On 7/23/21 7:03 PM, Alex Bennée wrote: > > > > I realised I'm on holiday next week so I thought I'd better send this now. > > > > > > > > The following changes since commit a146af86c8247f41b641783428b95ee71eb0e43f: > > > > > > > > Merge remote-tracking branch 'remotes/kraxel/tags/vga-20210723-pull-request' into staging (2021-07-23 12:16:12 +0100) > > > > > > > > are available in the Git repository at: > > > > > > > > https://github.com/stsquad/qemu.git tags/pull-for-6.1-rc1-230721-1 > > > > > > > > for you to fetch changes up to 0a9487d80af9ed6fa14d2696bc34a920b32e53e5: > > > > > > > > gitlab-ci: Extract OpenSBI job rules to reusable section (2021-07-23 17:22:16 +0100) > > > > > > > > ---------------------------------------------------------------- > > > > Doc, metadata, plugin and testing updates for 6.1-rc1: > > > > > > > > - git ignore some file editor detritus > > > > - add overview on device emulation terminology > > > > - remove needless if leg in configure custom devices logic > > > > - numerous gitdm/mailmap updates > > > > - fix plugin_exit race for linux-user > > > > - fix a few bugs in cache modelling plugin > > > > - fix plugin calculation of physical address > > > > - handle pure assembler/linker tcg tests outside of docker > > > > - add tricore build to gitlab > > > > - remove superfluous MacOSX task > > > > - generalise the OpenBSI gitlab rules > > > > > > > > ---------------------------------------------------------------- > > > > > > > > > > Philippe Mathieu-Daudé (1): > > > > gitlab-ci: Extract OpenSBI job rules to reusable section > > > > > > Oops this isn't to latest version of this patch :/ > > > > > > https://lists.gnu.org/archive/html/qemu-devel/2021-07/msg06130.html > > > > Given Alex is on holiday, should I apply this pullreq anyway and > > then you could send a patch to fix up the differences afterwards, > > or should we drop the pullreq (and maybe this stuff doesn't > > go in for rc1)? > > I think it is fine to apply the pullreq anyway. OK, I have done so. Applied, thanks. Please update the changelog at https://wiki.qemu.org/ChangeLog/6.1 for any user-visible changes. -- PMM
I realised I'm on holiday next week so I thought I'd better send this now. The following changes since commit a146af86c8247f41b641783428b95ee71eb0e43f: Merge remote-tracking branch 'remotes/kraxel/tags/vga-20210723-pull-request' into staging (2021-07-23 12:16:12 +0100) are available in the Git repository at: https://github.com/stsquad/qemu.git tags/pull-for-6.1-rc1-230721-1 for you to fetch changes up to 0a9487d80af9ed6fa14d2696bc34a920b32e53e5: gitlab-ci: Extract OpenSBI job rules to reusable section (2021-07-23 17:22:16 +0100) ---------------------------------------------------------------- Doc, metadata, plugin and testing updates for 6.1-rc1: - git ignore some file editor detritus - add overview on device emulation terminology - remove needless if leg in configure custom devices logic - numerous gitdm/mailmap updates - fix plugin_exit race for linux-user - fix a few bugs in cache modelling plugin - fix plugin calculation of physical address - handle pure assembler/linker tcg tests outside of docker - add tricore build to gitlab - remove superfluous MacOSX task - generalise the OpenBSI gitlab rules ---------------------------------------------------------------- Aaron Lindsay (1): plugins: Fix physical address calculation for IO regions Alex Bennée (21): docs: collect the disparate device emulation docs into one section docs: add a section on the generalities of vhost-user configure: remove needless if leg contrib/gitdm: add some new aliases to fix up commits .mailmap: fix up some broken commit authors contrib/gitdm: add domain-map for MontaVista contrib/gitdm: add a group mapping for robot scanners gitdm.config: sort the corporate GroupMap entries contrib/gitdm: add domain-map/group-map mappings for Samsung contrib/gitdm: add domain-map for Eldorado contrib/gitdm: add domain-map/group-map for Wind River contrib/gitdm: un-ironically add a mapping for LWN contrib/gitdm: add domain-map for Crudebyte contrib/gitdm: add domain-map for NVIDIA contrib/gitdm: add group-map for Netflix contrib/gitdm: add an explicit academic entry for BU contrib/gitdm: add a new interns group-map for GSoC/Outreachy work contrib/gitdm: add more individual contributor entries. tcg/plugins: implement a qemu_plugin_user_exit helper tests/tcg/configure.sh: add handling for assembler only builds gitlab: enable a very minimal build with the tricore container Mahmoud Mandour (3): plugins/cache: Fixed a bug with destroying FIFO metadata plugins/cache: limited the scope of a mutex lock plugins/cache: Fixed "function decl. is not a prototype" warnings Philippe Mathieu-Daudé (1): gitlab-ci: Extract OpenSBI job rules to reusable section Thomas Huth (1): gitlab-ci: Remove the second superfluous macos task Viresh Kumar (1): gitignore: Update with some filetypes docs/interop/vhost-user.rst | 2 + docs/system/device-emulation.rst | 90 ++++++++++++++++++++++ docs/system/{ => devices}/ivshmem.rst | 0 docs/system/{ => devices}/net.rst | 0 docs/system/{ => devices}/nvme.rst | 0 docs/system/{ => devices}/usb.rst | 0 docs/system/devices/vhost-user.rst | 59 ++++++++++++++ docs/system/{ => devices}/virtio-pmem.rst | 0 docs/system/index.rst | 6 +- configure | 10 +-- include/qemu/plugin.h | 12 +++ include/qemu/qemu-plugin.h | 13 ++++ bsd-user/syscall.c | 6 +- contrib/plugins/cache.c | 11 ++- linux-user/exit.c | 2 +- plugins/api.c | 2 +- plugins/core.c | 39 ++++++++++ .gitignore | 2 + .gitlab-ci.d/buildtest.yml | 11 +++ .gitlab-ci.d/cirrus.yml | 15 ---- .gitlab-ci.d/opensbi.yml | 28 ++++--- .mailmap | 4 + contrib/gitdm/aliases | 6 ++ contrib/gitdm/domain-map | 7 ++ contrib/gitdm/group-map-academics | 3 + contrib/gitdm/group-map-individuals | 5 ++ contrib/gitdm/group-map-interns | 13 ++++ contrib/gitdm/group-map-netflix | 5 ++ contrib/gitdm/group-map-robots | 7 ++ gitdm.config | 13 +++- .../docker/dockerfiles/debian-tricore-cross.docker | 34 ++++++-- tests/tcg/configure.sh | 18 +++++ 32 files changed, 366 insertions(+), 57 deletions(-) create mode 100644 docs/system/device-emulation.rst rename docs/system/{ => devices}/ivshmem.rst (100%) rename docs/system/{ => devices}/net.rst (100%) rename docs/system/{ => devices}/nvme.rst (100%) rename docs/system/{ => devices}/usb.rst (100%) create mode 100644 docs/system/devices/vhost-user.rst rename docs/system/{ => devices}/virtio-pmem.rst (100%) create mode 100644 contrib/gitdm/group-map-interns create mode 100644 contrib/gitdm/group-map-netflix create mode 100644 contrib/gitdm/group-map-robots