qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] a3a576: meson: reuse common_user_inc when bui


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] a3a576: meson: reuse common_user_inc when building files s...
Date: Thu, 13 Jan 2022 06:05:27 -0800

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: a3a576b0bf376eeb3cfc6c97c082628a8b73ff60
      
https://github.com/qemu/qemu/commit/a3a576b0bf376eeb3cfc6c97c082628a8b73ff60
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-12 (Wed, 12 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: 05a248715cef192336a594afed812871a52efc1f
      
https://github.com/qemu/qemu/commit/05a248715cef192336a594afed812871a52efc1f
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-12 (Wed, 12 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: 9d24fb73a1c1b0d892f8c26297f922c85460513d
      
https://github.com/qemu/qemu/commit/9d24fb73a1c1b0d892f8c26297f922c85460513d
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-12 (Wed, 12 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: a5730b8bd3675f484ed0eacea052452048eeb35d
      
https://github.com/qemu/qemu/commit/a5730b8bd3675f484ed0eacea052452048eeb35d
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2022-01-12 (Wed, 12 Jan 2022)

  Changed paths:
    M block/file-posix.c
    M configure
    M meson.build
    M scripts/ci/org.centos/stream/8/x86_64/configure
    M scripts/coverity-scan/run-coverity-scan

  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: 37650689473c4cdb5838f90cbc1aefbcd9332fb0
      
https://github.com/qemu/qemu/commit/37650689473c4cdb5838f90cbc1aefbcd9332fb0
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-12 (Wed, 12 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: b915a2f15c016c9e4a3ccafb99d445560742a9ab
      
https://github.com/qemu/qemu/commit/b915a2f15c016c9e4a3ccafb99d445560742a9ab
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-12 (Wed, 12 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: 9da9be2c26f509728106db591538bfa2eee03947
      
https://github.com/qemu/qemu/commit/9da9be2c26f509728106db591538bfa2eee03947
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-12 (Wed, 12 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: a70248dbd381b2ce82192acdcbc3bde441e6c29b
      
https://github.com/qemu/qemu/commit/a70248dbd381b2ce82192acdcbc3bde441e6c29b
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-12 (Wed, 12 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: 3b0d864384f2a273702168ab16935f0973011045
      
https://github.com/qemu/qemu/commit/3b0d864384f2a273702168ab16935f0973011045
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-12 (Wed, 12 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: b962a1d507bdb7e157f5e0ef3376f3e8e40edfe7
      
https://github.com/qemu/qemu/commit/b962a1d507bdb7e157f5e0ef3376f3e8e40edfe7
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-12 (Wed, 12 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: eed56e9a89f7003e692982a11002bbc432cc2d9f
      
https://github.com/qemu/qemu/commit/eed56e9a89f7003e692982a11002bbc432cc2d9f
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-12 (Wed, 12 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: b7a75c8c4275a4dec2d034a225f6446ca441e6d5
      
https://github.com/qemu/qemu/commit/b7a75c8c4275a4dec2d034a225f6446ca441e6d5
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-12 (Wed, 12 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: 8f515d386971c242be9aee0da4c21661e12fa30a
      
https://github.com/qemu/qemu/commit/8f515d386971c242be9aee0da4c21661e12fa30a
  Author: Maxim Levitsky <mlevitsk@redhat.com>
  Date:   2022-01-12 (Wed, 12 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: 1520f8bb671ce3c1b8a3b5ed3bbdfe1a06aa8691
      
https://github.com/qemu/qemu/commit/1520f8bb671ce3c1b8a3b5ed3bbdfe1a06aa8691
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-12 (Wed, 12 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: 533b0a1a41df3d9edeb44d6dc957f04d20ca143f
      
https://github.com/qemu/qemu/commit/533b0a1a41df3d9edeb44d6dc957f04d20ca143f
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2022-01-12 (Wed, 12 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: bb7cb3ad295c1d99e694f3133de571d80442fb61
      
https://github.com/qemu/qemu/commit/bb7cb3ad295c1d99e694f3133de571d80442fb61
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-12 (Wed, 12 Jan 2022)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: do not create roms/seabios/config.mak if SeaBIOS not present

If roms/seabios/Makefile is not present, the configure script
is not creating the roms/seabios directory anymore (commit
5dce7b8d8c, "configure: remove DIRS", 2021-12-18); thus, creating
roms/seabios/config.mak fails.

The easiest thing to do is to not create the file, since it will not
be used.

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


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

  Changed paths:
    M meson.build
    M tests/qtest/meson.build

  Log Message:
  -----------
  meson: build all modules by default

With more recent versions of Meson, the build.ninja file is more selective
as to what is built by default, and not building the modules results in test
failures.

Mark the modules as built-by-default and, to make the dependencies more
precise, also require them to be up-to-date before running tests.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/801
Tested-by: Li Zhang <lizhang@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 9d30c78c7d3b994825cbe63fa277279ae3ef4248
      
https://github.com/qemu/qemu/commit/9d30c78c7d3b994825cbe63fa277279ae3ef4248
  Author: Volker Rümelin <vr_qemu@t-online.de>
  Date:   2022-01-12 (Wed, 12 Jan 2022)

  Changed paths:
    M tests/unit/meson.build
    M util/meson.build

  Log Message:
  -----------
  meson: reenable filemonitor-inotify compilation

Reenable util/filemonitor-inotify compilation. Compilation was
disabled when commit a620fbe9ac ("configure: convert compiler tests
to meson, part 5") moved CONFIG_INOTIFY1 from config-host.mak to
config-host.h.

This fixes the usb-mtp device and reenables test-util-filemonitor.

Fixes: a620fbe9ac ("configure: convert compiler tests to meson, part 5")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/800
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Message-Id: <20220107133514.7785-1-vr_qemu@t-online.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 67b6526cf042f22521feff5ea521a05d3dd2bf8f
      
https://github.com/qemu/qemu/commit/67b6526cf042f22521feff5ea521a05d3dd2bf8f
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2022-01-13 (Thu, 13 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
    M scripts/ci/org.centos/stream/8/x86_64/configure
    M scripts/coverity-scan/run-coverity-scan
    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/qtest/meson.build
    M tests/tcg/Makefile.target
    M tests/unit/meson.build
    M util/meson.build

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into 
staging

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

# gpg: Signature made Wed 12 Jan 2022 13:09:19 GMT
# gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:                issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# 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

* remotes/bonzini-gitlab/tags/for-upstream:
  meson: reenable filemonitor-inotify compilation
  meson: build all modules by default
  configure: do not create roms/seabios/config.mak if SeaBIOS not present
  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: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/f8d75e10d3e0...67b6526cf042



reply via email to

[Prev in Thread] Current Thread [Next in Thread]