mbox

[PULL,v3,00/15] Build system and KVM changes for 2021-12-23

Message ID 20220104145749.417387-1-pbonzini@redhat.com
State New
Headers show

Pull-request

https://gitlab.com/bonzini/qemu.git tags/for-upstream

Message

Paolo Bonzini Jan. 4, 2022, 2:57 p.m. UTC
The following changes since commit b5a3d8bc9146ba22a25116cb748c97341bf99737:

  Merge tag 'pull-misc-20220103' of https://gitlab.com/rth7680/qemu into staging (2022-01-03 09:34:41 -0800)

are available in the Git repository at:

  https://gitlab.com/bonzini/qemu.git tags/for-upstream

for you to fetch changes up to a2c137e7e00d1bfcc80a17ff8e5104d0e1de2f9a:

  tests/tcg: Fix target-specific Makefile variables path for user-mode (2022-01-04 14:08:44 +0100)

----------------------------------------------------------------
* configure and meson cleanups
* KVM_GET/SET_SREGS2 support for x86

----------------------------------------------------------------

I dropped the tricore Dockerfile change because it is still broken occasionally
with the patch.

Maxim Levitsky (1):
      KVM: use KVM_{GET|SET}_SREGS2 when supported.

Paolo Bonzini (12):
      meson: reuse common_user_inc when building files specific to user-mode emulators
      user: move common-user includes to a subdirectory of {bsd,linux}-user/
      meson: cleanup common-user/ build
      configure: simplify creation of plugin symbol list
      configure: do not set bsd_user/linux_user early
      configure, makefile: remove traces of really old files
      configure: parse --enable/--disable-strip automatically, flip default
      configure: move non-command-line variables away from command-line parsing section
      meson: build contrib/ executables after generated headers
      configure, meson: move config-poison.h to meson
      meson: add comments in the target-specific flags section
      KVM: x86: ignore interrupt_bitmap field of KVM_GET/SET_SREGS

Philippe Mathieu-Daudé (1):
      tests/tcg: Fix target-specific Makefile variables path for user-mode

Thomas Huth (1):
      block/file-posix: Simplify the XFS_IOC_DIOINFO handling

 Makefile                                           |  11 +-
 block/file-posix.c                                 |  37 ++---
 bsd-user/{ => include}/special-errno.h             |   0
 bsd-user/meson.build                               |   2 +-
 common-user/meson.build                            |   2 +-
 configure                                          | 182 +++------------------
 contrib/elf2dmp/meson.build                        |   2 +-
 contrib/ivshmem-client/meson.build                 |   2 +-
 contrib/ivshmem-server/meson.build                 |   2 +-
 contrib/rdmacm-mux/meson.build                     |   2 +-
 .../{ => include}/host/aarch64/host-signal.h       |   0
 linux-user/{ => include}/host/alpha/host-signal.h  |   0
 linux-user/{ => include}/host/arm/host-signal.h    |   0
 linux-user/{ => include}/host/i386/host-signal.h   |   0
 .../{ => include}/host/loongarch64/host-signal.h   |   0
 linux-user/{ => include}/host/mips/host-signal.h   |   0
 linux-user/{ => include}/host/ppc/host-signal.h    |   0
 linux-user/{ => include}/host/ppc64/host-signal.h  |   0
 linux-user/{ => include}/host/riscv/host-signal.h  |   0
 linux-user/{ => include}/host/s390/host-signal.h   |   0
 linux-user/{ => include}/host/s390x/host-signal.h  |   0
 linux-user/{ => include}/host/sparc/host-signal.h  |   0
 .../{ => include}/host/sparc64/host-signal.h       |   0
 linux-user/{ => include}/host/x32/host-signal.h    |   0
 linux-user/{ => include}/host/x86_64/host-signal.h |   0
 linux-user/{ => include}/special-errno.h           |   0
 linux-user/meson.build                             |   4 +-
 meson.build                                        |  33 ++--
 pc-bios/s390-ccw/Makefile                          |   2 -
 plugins/meson.build                                |  11 +-
 scripts/make-config-poison.sh                      |  16 ++
 scripts/meson-buildoptions.py                      |  21 ++-
 scripts/meson-buildoptions.sh                      |   3 +
 target/i386/cpu.h                                  |   3 +
 target/i386/kvm/kvm.c                              | 130 +++++++++++++--
 target/i386/machine.c                              |  29 ++++
 tests/tcg/Makefile.target                          |   2 +-
 37 files changed, 259 insertions(+), 237 deletions(-)
 rename bsd-user/{ => include}/special-errno.h (100%)
 rename linux-user/{ => include}/host/aarch64/host-signal.h (100%)
 rename linux-user/{ => include}/host/alpha/host-signal.h (100%)
 rename linux-user/{ => include}/host/arm/host-signal.h (100%)
 rename linux-user/{ => include}/host/i386/host-signal.h (100%)
 rename linux-user/{ => include}/host/loongarch64/host-signal.h (100%)
 rename linux-user/{ => include}/host/mips/host-signal.h (100%)
 rename linux-user/{ => include}/host/ppc/host-signal.h (100%)
 rename linux-user/{ => include}/host/ppc64/host-signal.h (100%)
 rename linux-user/{ => include}/host/riscv/host-signal.h (100%)
 rename linux-user/{ => include}/host/s390/host-signal.h (100%)
 rename linux-user/{ => include}/host/s390x/host-signal.h (100%)
 rename linux-user/{ => include}/host/sparc/host-signal.h (100%)
 rename linux-user/{ => include}/host/sparc64/host-signal.h (100%)
 rename linux-user/{ => include}/host/x32/host-signal.h (100%)
 rename linux-user/{ => include}/host/x86_64/host-signal.h (100%)
 rename linux-user/{ => include}/special-errno.h (100%)
 create mode 100755 scripts/make-config-poison.sh

Comments

Richard Henderson Jan. 4, 2022, 11:12 p.m. UTC | #1
On 1/4/22 6:57 AM, Paolo Bonzini wrote:
> The following changes since commit b5a3d8bc9146ba22a25116cb748c97341bf99737:
> 
>    Merge tag 'pull-misc-20220103' of https://gitlab.com/rth7680/qemu into staging (2022-01-03 09:34:41 -0800)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/bonzini/qemu.git tags/for-upstream
> 
> for you to fetch changes up to a2c137e7e00d1bfcc80a17ff8e5104d0e1de2f9a:
> 
>    tests/tcg: Fix target-specific Makefile variables path for user-mode (2022-01-04 14:08:44 +0100)
> 
> ----------------------------------------------------------------
> * configure and meson cleanups
> * KVM_GET/SET_SREGS2 support for x86
> 
> ----------------------------------------------------------------
> 
> I dropped the tricore Dockerfile change because it is still broken occasionally
> with the patch.
> 
> Maxim Levitsky (1):
>        KVM: use KVM_{GET|SET}_SREGS2 when supported.
> 
> Paolo Bonzini (12):
>        meson: reuse common_user_inc when building files specific to user-mode emulators
>        user: move common-user includes to a subdirectory of {bsd,linux}-user/
>        meson: cleanup common-user/ build
>        configure: simplify creation of plugin symbol list
>        configure: do not set bsd_user/linux_user early
>        configure, makefile: remove traces of really old files
>        configure: parse --enable/--disable-strip automatically, flip default
>        configure: move non-command-line variables away from command-line parsing section
>        meson: build contrib/ executables after generated headers
>        configure, meson: move config-poison.h to meson
>        meson: add comments in the target-specific flags section
>        KVM: x86: ignore interrupt_bitmap field of KVM_GET/SET_SREGS
> 
> Philippe Mathieu-Daudé (1):
>        tests/tcg: Fix target-specific Makefile variables path for user-mode
> 
> Thomas Huth (1):
>        block/file-posix: Simplify the XFS_IOC_DIOINFO handling
> 
>   Makefile                                           |  11 +-
>   block/file-posix.c                                 |  37 ++---
>   bsd-user/{ => include}/special-errno.h             |   0
>   bsd-user/meson.build                               |   2 +-
>   common-user/meson.build                            |   2 +-
>   configure                                          | 182 +++------------------
>   contrib/elf2dmp/meson.build                        |   2 +-
>   contrib/ivshmem-client/meson.build                 |   2 +-
>   contrib/ivshmem-server/meson.build                 |   2 +-
>   contrib/rdmacm-mux/meson.build                     |   2 +-
>   .../{ => include}/host/aarch64/host-signal.h       |   0
>   linux-user/{ => include}/host/alpha/host-signal.h  |   0
>   linux-user/{ => include}/host/arm/host-signal.h    |   0
>   linux-user/{ => include}/host/i386/host-signal.h   |   0
>   .../{ => include}/host/loongarch64/host-signal.h   |   0
>   linux-user/{ => include}/host/mips/host-signal.h   |   0
>   linux-user/{ => include}/host/ppc/host-signal.h    |   0
>   linux-user/{ => include}/host/ppc64/host-signal.h  |   0
>   linux-user/{ => include}/host/riscv/host-signal.h  |   0
>   linux-user/{ => include}/host/s390/host-signal.h   |   0
>   linux-user/{ => include}/host/s390x/host-signal.h  |   0
>   linux-user/{ => include}/host/sparc/host-signal.h  |   0
>   .../{ => include}/host/sparc64/host-signal.h       |   0
>   linux-user/{ => include}/host/x32/host-signal.h    |   0
>   linux-user/{ => include}/host/x86_64/host-signal.h |   0
>   linux-user/{ => include}/special-errno.h           |   0
>   linux-user/meson.build                             |   4 +-
>   meson.build                                        |  33 ++--
>   pc-bios/s390-ccw/Makefile                          |   2 -
>   plugins/meson.build                                |  11 +-
>   scripts/make-config-poison.sh                      |  16 ++
>   scripts/meson-buildoptions.py                      |  21 ++-
>   scripts/meson-buildoptions.sh                      |   3 +
>   target/i386/cpu.h                                  |   3 +
>   target/i386/kvm/kvm.c                              | 130 +++++++++++++--
>   target/i386/machine.c                              |  29 ++++
>   tests/tcg/Makefile.target                          |   2 +-
>   37 files changed, 259 insertions(+), 237 deletions(-)
>   rename bsd-user/{ => include}/special-errno.h (100%)
>   rename linux-user/{ => include}/host/aarch64/host-signal.h (100%)
>   rename linux-user/{ => include}/host/alpha/host-signal.h (100%)
>   rename linux-user/{ => include}/host/arm/host-signal.h (100%)
>   rename linux-user/{ => include}/host/i386/host-signal.h (100%)
>   rename linux-user/{ => include}/host/loongarch64/host-signal.h (100%)
>   rename linux-user/{ => include}/host/mips/host-signal.h (100%)
>   rename linux-user/{ => include}/host/ppc/host-signal.h (100%)
>   rename linux-user/{ => include}/host/ppc64/host-signal.h (100%)
>   rename linux-user/{ => include}/host/riscv/host-signal.h (100%)
>   rename linux-user/{ => include}/host/s390/host-signal.h (100%)
>   rename linux-user/{ => include}/host/s390x/host-signal.h (100%)
>   rename linux-user/{ => include}/host/sparc/host-signal.h (100%)
>   rename linux-user/{ => include}/host/sparc64/host-signal.h (100%)
>   rename linux-user/{ => include}/host/x32/host-signal.h (100%)
>   rename linux-user/{ => include}/host/x86_64/host-signal.h (100%)
>   rename linux-user/{ => include}/special-errno.h (100%)
>   create mode 100755 scripts/make-config-poison.sh

Somewhere in there it breaks plugins:

https://gitlab.com/qemu-project/qemu/-/jobs/1941264303
https://gitlab.com/qemu-project/qemu/-/jobs/1941264320
https://gitlab.com/qemu-project/qemu/-/jobs/1941264310

  (143/171) tests/avocado/tcg_plugins.py:PluginKernelNormal.test_aarch64_virt_insn: 
INTERRUPTED: TCG Plugins not enabled?\nRunner error occurred: Timeout reached\nOriginal 
status: CANCEL\n{'name': 
'143-tests/avocado/tcg_plugins.py:PluginKernelNormal.test_aarch64_virt_insn', 'logdir': 
'/builds/qemu-project/qemu/build/tests/results/job-2022-01-04T20.25-ad... (121.12 s)
  (144/171) tests/avocado/tcg_plugins.py:PluginKernelNormal.test_aarch64_virt_insn_icount: 
  INTERRUPTED: TCG Plugins not enabled?\nRunner error occurred: Timeout reached\nOriginal 
status: CANCEL\n{'name': 
'144-tests/avocado/tcg_plugins.py:PluginKernelNormal.test_aarch64_virt_insn_icount', 
'logdir': '/builds/qemu-project/qemu/build/tests/results/job-2022-01-04T2... (120.15 s)
  (145/171) tests/avocado/tcg_plugins.py:PluginKernelNormal.test_aarch64_virt_mem_icount: 
  INTERRUPTED: TCG Plugins not enabled?\nRunner error occurred: Timeout reached\nOriginal 
status: CANCEL\n{'name': 
'145-tests/avocado/tcg_plugins.py:PluginKernelNormal.test_aarch64_virt_mem_icount', 
'logdir': '/builds/qemu-project/qemu/build/tests/results/job-2022-01-04T20... (120.15 s)


r~