[Qemu-commits] [qemu/qemu] 5db3ed: meson: reuse common_user_inc when building files s...

[Richard Henderson]

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 5db3ed7e5f07b7deffe8257467cdbfb6d43d422c
      
https://github.com/qemu/qemu/commit/5db3ed7e5f07b7deffe8257467cdbfb6d43d422c
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-04 (Tue, 04 Jan 2022)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson: reuse common_user_inc when building files specific to user-mode 
emulators

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: cddc3e92e9a12930d2eaf64f52bab9ff54204e12
      
https://github.com/qemu/qemu/commit/cddc3e92e9a12930d2eaf64f52bab9ff54204e12
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-04 (Tue, 04 Jan 2022)

  Changed paths:
    A bsd-user/include/special-errno.h
    M bsd-user/meson.build
    R bsd-user/special-errno.h
    R linux-user/host/aarch64/host-signal.h
    R linux-user/host/alpha/host-signal.h
    R linux-user/host/arm/host-signal.h
    R linux-user/host/i386/host-signal.h
    R linux-user/host/loongarch64/host-signal.h
    R linux-user/host/mips/host-signal.h
    R linux-user/host/ppc/host-signal.h
    R linux-user/host/ppc64/host-signal.h
    R linux-user/host/riscv/host-signal.h
    R linux-user/host/s390/host-signal.h
    R linux-user/host/s390x/host-signal.h
    R linux-user/host/sparc/host-signal.h
    R linux-user/host/sparc64/host-signal.h
    R linux-user/host/x32/host-signal.h
    R linux-user/host/x86_64/host-signal.h
    A linux-user/include/host/aarch64/host-signal.h
    A linux-user/include/host/alpha/host-signal.h
    A linux-user/include/host/arm/host-signal.h
    A linux-user/include/host/i386/host-signal.h
    A linux-user/include/host/loongarch64/host-signal.h
    A linux-user/include/host/mips/host-signal.h
    A linux-user/include/host/ppc/host-signal.h
    A linux-user/include/host/ppc64/host-signal.h
    A linux-user/include/host/riscv/host-signal.h
    A linux-user/include/host/s390/host-signal.h
    A linux-user/include/host/s390x/host-signal.h
    A linux-user/include/host/sparc/host-signal.h
    A linux-user/include/host/sparc64/host-signal.h
    A linux-user/include/host/x32/host-signal.h
    A linux-user/include/host/x86_64/host-signal.h
    A linux-user/include/special-errno.h
    M linux-user/meson.build
    R linux-user/special-errno.h

  Log Message:
  -----------
  user: move common-user includes to a subdirectory of {bsd,linux}-user/

Avoid polluting the compilation of common-user/ with local include files;
making an include file available to common-user/ should be a deliberate
decision in order to keep a clear interface that can be used by both
bsd-user/ and linux-user/.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 78803d355e16fcda8e4d216085c70f6588eef274
      
https://github.com/qemu/qemu/commit/78803d355e16fcda8e4d216085c70f6588eef274
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-04 (Tue, 04 Jan 2022)

  Changed paths:
    M common-user/meson.build
    M meson.build

  Log Message:
  -----------
  meson: cleanup common-user/ build

It is not necessary to have a separate static_library just for common_user
files; using the one that already covers the rest of common_ss is enough
unless you need to reuse some source files between emulators and tests.
Just place common files for all user-mode emulators in common_ss,
similar to what is already done for softmmu_ss in full system emulators.

The only disadvantage is that the include_directories under bsd-user/include/
and linux-user/include/ are now enabled for all targets rather than only
user mode emulators.  This however is not different from how include/sysemu/
is available when building user mode emulators.

Tested-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 3487e56c747abfdd1eacd532561e7eb87ce960b9
      
https://github.com/qemu/qemu/commit/3487e56c747abfdd1eacd532561e7eb87ce960b9
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2022-01-04 (Tue, 04 Jan 2022)

  Changed paths:
    M block/file-posix.c
    M configure
    M meson.build

  Log Message:
  -----------
  block/file-posix: Simplify the XFS_IOC_DIOINFO handling

The handling for the XFS_IOC_DIOINFO ioctl is currently quite excessive:
This is not a "real" feature like the other features that we provide with
the "--enable-xxx" and "--disable-xxx" switches for the configure script,
since this does not influence lots of code (it's only about one call to
xfsctl() in file-posix.c), so people don't gain much with the ability to
disable this with "--disable-xfsctl".
It's also unfortunate that the ioctl will be disabled on Linux in case
the user did not install the right xfsprogs-devel package before running
configure. Thus let's simplify this by providing the ioctl definition
on our own, so we can completely get rid of the header dependency and
thus the related code in the configure script.

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20211215125824.250091-1-thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 566a0893d1fcacbc4f99245806fb945da6d4bb90
      
https://github.com/qemu/qemu/commit/566a0893d1fcacbc4f99245806fb945da6d4bb90
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-04 (Tue, 04 Jan 2022)

  Changed paths:
    M configure
    M plugins/meson.build

  Log Message:
  -----------
  configure: simplify creation of plugin symbol list

--dynamic-list is present on all supported ELF (not Windows or Darwin)
platforms, since it dates back to 2006; -exported_symbols_list is
likewise present on all supported versions of macOS.  Do not bother
doing a functional test in configure.

Remove the file creation from configure as well: for Darwin, move the
the creation of the Darwin-formatted symbols to meson; for ELF, use the
file in the source path directly and switch from -Wl, to -Xlinker to
not break weird paths that include a comma.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 6f3d315f7def58fbc89093576d7e21a5e6181bba
      
https://github.com/qemu/qemu/commit/6f3d315f7def58fbc89093576d7e21a5e6181bba
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-04 (Tue, 04 Jan 2022)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: do not set bsd_user/linux_user early

Similar to other optional features, leave the variables empty and compute
the actual value later.  Use the existence of include or source directories
to detect whether an OS or CPU supports respectively bsd-user and linux-user.

For now, BSD user-mode emulation is buildable even on TCI-only
architectures.  This probably will change once safe signals are
brought over from linux-user.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: bd2ad7e5f5853714c422aab1b9aa3bce1210c311
      
https://github.com/qemu/qemu/commit/bd2ad7e5f5853714c422aab1b9aa3bce1210c311
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-04 (Tue, 04 Jan 2022)

  Changed paths:
    M Makefile
    M configure

  Log Message:
  -----------
  configure, makefile: remove traces of really old files

These files have been removed for more than year in the best
case, or for more than ten years for some really old TCG files.
Remove any traces of it.

Acked-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 00e494a9c33ba644d9078c0cd5cbb8ea8ee19320
      
https://github.com/qemu/qemu/commit/00e494a9c33ba644d9078c0cd5cbb8ea8ee19320
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-04 (Tue, 04 Jan 2022)

  Changed paths:
    M configure
    M pc-bios/s390-ccw/Makefile
    M scripts/meson-buildoptions.py
    M scripts/meson-buildoptions.sh

  Log Message:
  -----------
  configure: parse --enable/--disable-strip automatically, flip default

Always include the STRIP variable in config-host.mak (it's only used
by the s390-ccw firmware build, and it adds a default if configure
omitted it), and use meson-buildoptions.sh to turn
--enable/--disable-strip into -Dstrip.

The default is now not to strip the binaries like for almost every other
package that has a configure script.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 7d48d0a6055c83c501923509427d26b2c6d3b856
      
https://github.com/qemu/qemu/commit/7d48d0a6055c83c501923509427d26b2c6d3b856
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-04 (Tue, 04 Jan 2022)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: move non-command-line variables away from command-line parsing 
section

This makes it easier to identify candidates for moving to Meson.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 00e30eb3925dd299734e8e8bce9bab696f602529
      
https://github.com/qemu/qemu/commit/00e30eb3925dd299734e8e8bce9bab696f602529
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-04 (Tue, 04 Jan 2022)

  Changed paths:
    M contrib/elf2dmp/meson.build
    M contrib/ivshmem-client/meson.build
    M contrib/ivshmem-server/meson.build
    M contrib/rdmacm-mux/meson.build

  Log Message:
  -----------
  meson: build contrib/ executables after generated headers

This will be needed as soon as config-poison.h moves from configure to
a meson custom_target (which is built at "ninja" time).

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 837788e62648161aa4a9b1deccf124e278b6400c
      
https://github.com/qemu/qemu/commit/837788e62648161aa4a9b1deccf124e278b6400c
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-04 (Tue, 04 Jan 2022)

  Changed paths:
    M Makefile
    M configure
    M meson.build
    A scripts/make-config-poison.sh

  Log Message:
  -----------
  configure, meson: move config-poison.h to meson

This ensures that the file is regenerated properly whenever config-target.h
or config-devices.h files change.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 4ff9875d88eb5282faccc9a1d2fdbb17077f42b8
      
https://github.com/qemu/qemu/commit/4ff9875d88eb5282faccc9a1d2fdbb17077f42b8
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-04 (Tue, 04 Jan 2022)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson: add comments in the target-specific flags section

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 53177f0f4dcbc92a3f50476a99c33623e012af57
      
https://github.com/qemu/qemu/commit/53177f0f4dcbc92a3f50476a99c33623e012af57
  Author: Maxim Levitsky <mlevitsk@redhat.com>
  Date:   2022-01-04 (Tue, 04 Jan 2022)

  Changed paths:
    M target/i386/cpu.h
    M target/i386/kvm/kvm.c
    M target/i386/machine.c

  Log Message:
  -----------
  KVM: use KVM_{GET|SET}_SREGS2 when supported.

This allows to make PDPTRs part of the migration
stream and thus not reload them after migration which
is against X86 spec.

Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
Message-Id: <20211101132300.192584-2-mlevitsk@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: f0e48d5094097e5f4d580dfe40c39df8b9237347
      
https://github.com/qemu/qemu/commit/f0e48d5094097e5f4d580dfe40c39df8b9237347
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-04 (Tue, 04 Jan 2022)

  Changed paths:
    M target/i386/kvm/kvm.c

  Log Message:
  -----------
  KVM: x86: ignore interrupt_bitmap field of KVM_GET/SET_SREGS

This is unnecessary, because the interrupt would be retrieved and queued
anyway by KVM_GET_VCPU_EVENTS and KVM_SET_VCPU_EVENTS respectively,
and it makes the flow more similar to the one for KVM_GET/SET_SREGS2.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: a2c137e7e00d1bfcc80a17ff8e5104d0e1de2f9a
      
https://github.com/qemu/qemu/commit/a2c137e7e00d1bfcc80a17ff8e5104d0e1de2f9a
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2022-01-04 (Tue, 04 Jan 2022)

  Changed paths:
    M tests/tcg/Makefile.target

  Log Message:
  -----------
  tests/tcg: Fix target-specific Makefile variables path for user-mode

Commit 812b31d3f91 refactor missed to update this path.

Fixes: 812b31d3f91 ("configs: rename default-configs to configs and reorganise")
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20211226001541.3807919-1-f4bug@amsat.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 8446c8e3f2ebc5430696c65d1fafdbfabce23694
      
https://github.com/qemu/qemu/commit/8446c8e3f2ebc5430696c65d1fafdbfabce23694
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2022-01-04 (Tue, 04 Jan 2022)

  Changed paths:
    M Makefile
    M block/file-posix.c
    A bsd-user/include/special-errno.h
    M bsd-user/meson.build
    R bsd-user/special-errno.h
    M common-user/meson.build
    M configure
    M contrib/elf2dmp/meson.build
    M contrib/ivshmem-client/meson.build
    M contrib/ivshmem-server/meson.build
    M contrib/rdmacm-mux/meson.build
    R linux-user/host/aarch64/host-signal.h
    R linux-user/host/alpha/host-signal.h
    R linux-user/host/arm/host-signal.h
    R linux-user/host/i386/host-signal.h
    R linux-user/host/loongarch64/host-signal.h
    R linux-user/host/mips/host-signal.h
    R linux-user/host/ppc/host-signal.h
    R linux-user/host/ppc64/host-signal.h
    R linux-user/host/riscv/host-signal.h
    R linux-user/host/s390/host-signal.h
    R linux-user/host/s390x/host-signal.h
    R linux-user/host/sparc/host-signal.h
    R linux-user/host/sparc64/host-signal.h
    R linux-user/host/x32/host-signal.h
    R linux-user/host/x86_64/host-signal.h
    A linux-user/include/host/aarch64/host-signal.h
    A linux-user/include/host/alpha/host-signal.h
    A linux-user/include/host/arm/host-signal.h
    A linux-user/include/host/i386/host-signal.h
    A linux-user/include/host/loongarch64/host-signal.h
    A linux-user/include/host/mips/host-signal.h
    A linux-user/include/host/ppc/host-signal.h
    A linux-user/include/host/ppc64/host-signal.h
    A linux-user/include/host/riscv/host-signal.h
    A linux-user/include/host/s390/host-signal.h
    A linux-user/include/host/s390x/host-signal.h
    A linux-user/include/host/sparc/host-signal.h
    A linux-user/include/host/sparc64/host-signal.h
    A linux-user/include/host/x32/host-signal.h
    A linux-user/include/host/x86_64/host-signal.h
    A linux-user/include/special-errno.h
    M linux-user/meson.build
    R linux-user/special-errno.h
    M meson.build
    M pc-bios/s390-ccw/Makefile
    M plugins/meson.build
    A scripts/make-config-poison.sh
    M scripts/meson-buildoptions.py
    M scripts/meson-buildoptions.sh
    M target/i386/cpu.h
    M target/i386/kvm/kvm.c
    M target/i386/machine.c
    M tests/tcg/Makefile.target

  Log Message:
  -----------
  Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging

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

# gpg: Signature made Tue 04 Jan 2022 05:08:49 AM PST
# gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:                issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [undefined]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [undefined]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* tag 'for-upstream' of https://gitlab.com/bonzini/qemu:
  tests/tcg: Fix target-specific Makefile variables path for user-mode
  KVM: x86: ignore interrupt_bitmap field of KVM_GET/SET_SREGS
  KVM: use KVM_{GET|SET}_SREGS2 when supported.
  meson: add comments in the target-specific flags section
  configure, meson: move config-poison.h to meson
  meson: build contrib/ executables after generated headers
  configure: move non-command-line variables away from command-line parsing 
section
  configure: parse --enable/--disable-strip automatically, flip default
  configure, makefile: remove traces of really old files
  configure: do not set bsd_user/linux_user early
  configure: simplify creation of plugin symbol list
  block/file-posix: Simplify the XFS_IOC_DIOINFO handling
  meson: cleanup common-user/ build
  user: move common-user includes to a subdirectory of {bsd,linux}-user/
  meson: reuse common_user_inc when building files specific to user-mode 
emulators

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


Compare: https://github.com/qemu/qemu/compare/1407ecba265c...8446c8e3f2eb