qemu-commits
[Top][All Lists]
Advanced

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

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


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] 7efe63: meson: reuse common_user_inc when building files s...
Date: Mon, 10 Jan 2022 11:14:10 -0800

  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 7efe6308619a4a4c61b5e72bd6881e26aa2b514f
      
https://github.com/qemu/qemu/commit/7efe6308619a4a4c61b5e72bd6881e26aa2b514f
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-08 (Sat, 08 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: 6485b79360f2b364eb18b260a8ed35aa1cc1751e
      
https://github.com/qemu/qemu/commit/6485b79360f2b364eb18b260a8ed35aa1cc1751e
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-08 (Sat, 08 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: 6eee6c9eb97f837a428e47867558ddf763bd0f3c
      
https://github.com/qemu/qemu/commit/6eee6c9eb97f837a428e47867558ddf763bd0f3c
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-08 (Sat, 08 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: 1a4beebb62d2edc6c2cbcce8179af964ec130d18
      
https://github.com/qemu/qemu/commit/1a4beebb62d2edc6c2cbcce8179af964ec130d18
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2022-01-08 (Sat, 08 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: db64cfea54e9cda6bbfd0c95c43391502480fb15
      
https://github.com/qemu/qemu/commit/db64cfea54e9cda6bbfd0c95c43391502480fb15
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-08 (Sat, 08 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: f88146ef42c2ce14d8ea4e34c3398f04b741836d
      
https://github.com/qemu/qemu/commit/f88146ef42c2ce14d8ea4e34c3398f04b741836d
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-08 (Sat, 08 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: 536ed751eeb1681c782f1e5c3d42526a40728075
      
https://github.com/qemu/qemu/commit/536ed751eeb1681c782f1e5c3d42526a40728075
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-08 (Sat, 08 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: 03b82190989f223343bbfdca366ea3c0a8235553
      
https://github.com/qemu/qemu/commit/03b82190989f223343bbfdca366ea3c0a8235553
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-08 (Sat, 08 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: 2018c2948c30bdf961e1185d11777af4ca64f1b2
      
https://github.com/qemu/qemu/commit/2018c2948c30bdf961e1185d11777af4ca64f1b2
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-08 (Sat, 08 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: b1b1ec6602d519fefb088e3d7ec27de992d5d9db
      
https://github.com/qemu/qemu/commit/b1b1ec6602d519fefb088e3d7ec27de992d5d9db
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-08 (Sat, 08 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: 3b920997d71e1a0fd297056c30ecc76aa812e7f7
      
https://github.com/qemu/qemu/commit/3b920997d71e1a0fd297056c30ecc76aa812e7f7
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-08 (Sat, 08 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: c3908e4f6dc009b696d34949277fb550fe30eb82
      
https://github.com/qemu/qemu/commit/c3908e4f6dc009b696d34949277fb550fe30eb82
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-08 (Sat, 08 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: 36f29b532bbf6edaedd9d743f754b58d970a3486
      
https://github.com/qemu/qemu/commit/36f29b532bbf6edaedd9d743f754b58d970a3486
  Author: Maxim Levitsky <mlevitsk@redhat.com>
  Date:   2022-01-08 (Sat, 08 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: beae5d814c7d178d6727808425c12e93109f9449
      
https://github.com/qemu/qemu/commit/beae5d814c7d178d6727808425c12e93109f9449
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-08 (Sat, 08 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: a67c066f0d5f3f11cac2720515540c1ff5746002
      
https://github.com/qemu/qemu/commit/a67c066f0d5f3f11cac2720515540c1ff5746002
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2022-01-08 (Sat, 08 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: da6550d6a319e2937845aa4237d89b6194d3ece4
      
https://github.com/qemu/qemu/commit/da6550d6a319e2937845aa4237d89b6194d3ece4
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-08 (Sat, 08 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: ff2875db6af801ad9f815ca33c43f402fd81f6c4
      
https://github.com/qemu/qemu/commit/ff2875db6af801ad9f815ca33c43f402fd81f6c4
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2022-01-08 (Sat, 08 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: fb714a07243a88c41002c23a24e174c5d9d40d57
      
https://github.com/qemu/qemu/commit/fb714a07243a88c41002c23a24e174c5d9d40d57
  Author: Volker Rümelin <vr_qemu@t-online.de>
  Date:   2022-01-09 (Sun, 09 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: a44fbab352fc3ce35855da1c913b3b22b936527f
      
https://github.com/qemu/qemu/commit/a44fbab352fc3ce35855da1c913b3b22b936527f
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2022-01-10 (Mon, 10 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/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 Sun 09 Jan 2022 16:46:00 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/8ffcccb978a5...a44fbab352fc



reply via email to

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