[Qemu-commits] [qemu/qemu] bd5f97: trace: fix creation of systemtap files

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: bd5f973ac22046d1cd532847630e9ee10ebd8d76
      
https://github.com/qemu/qemu/commit/bd5f973ac22046d1cd532847630e9ee10ebd8d76
  Author: Stefan Hajnoczi <stefanha@redhat.com>
  Date:   2020-08-27 (Thu, 27 Aug 2020)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  trace: fix creation of systemtap files

The "exe_name" variable was renamed to exe['name'], so systemtap
files fail to build.

Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 5f7e966b2748cab6f734a8b7347be8f77a35e2b3
      
https://github.com/qemu/qemu/commit/5f7e966b2748cab6f734a8b7347be8f77a35e2b3
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-08-27 (Thu, 27 Aug 2020)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson: Build qemu-nbd on macOS again

Before switching to the meson build system, we used to compile qemu-nbd
for macOS, too, which is especially important for running the iotests
there. Commit b7c70bf2c5 disabled it by accident, since it did not take
into consideration that the $bsd variable in the configure script was
also set to "yes" on macOS. Fix it by enabling qemu-nbd on all systems
but Windows now instead (which was likely the original intention of the
old code in the configure script).

Fixes: b7c70bf2c5 ("meson: qemu-{img,io,nbd}")
Signed-off-by: Thomas Huth <thuth@redhat.com>
Acked-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 568ac779a4111484d9bf9fa7364a62d5d5cf9079
      
https://github.com/qemu/qemu/commit/568ac779a4111484d9bf9fa7364a62d5d5cf9079
  Author: Roman Bolshakov <r.bolshakov@yadro.com>
  Date:   2020-08-27 (Thu, 27 Aug 2020)

  Changed paths:
    M trace/meson.build

  Log Message:
  -----------
  meson: Don't make object files for dtrace on macOS

dtrace on macOS uses unresolved symbols with a special prefix to define
probes [1], only headers should be generated for USDT (dtrace(1)). But
it doesn't support backwards compatible no-op -G flag [2] and implicit
build rules fail.

1. https://markmail.org/message/6grq2ygr5nwdwsnb
2. https://markmail.org/message/5xrxt2w5m42nojkz

Cc: Daniel P. Berrangé <berrange@redhat.com>
Cc: Cameron Esfahani <dirty@apple.com>
Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 72bfe8ea63f98bbe3e4d709462cc543fb0187d32
      
https://github.com/qemu/qemu/commit/72bfe8ea63f98bbe3e4d709462cc543fb0187d32
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-08-27 (Thu, 27 Aug 2020)

  Changed paths:
    M scripts/qemu-version.sh

  Log Message:
  -----------
  scripts/qemu-version.sh: Add missing space before ']'

When configure has been run with --with-pkgversion=xyz, the shell complains
about a missing ']' in this script.

Fixes: 2c273f32d3 ("meson: generate qemu-version.h")
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: c7c91a749b33412fe2a0a973799b6c44a3f73613
      
https://github.com/qemu/qemu/commit/c7c91a749b33412fe2a0a973799b6c44a3f73613
  Author: Bruce Rogers <brogers@suse.com>
  Date:   2020-08-27 (Thu, 27 Aug 2020)

  Changed paths:
    M configure
    M meson.build

  Log Message:
  -----------
  meson: Fix meson build with --enable-libdaxctl

The daxctl library needs to be linked against when daxctl is asked for
in configure.

Signed-off-by: Bruce Rogers <brogers@suse.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 48e33de58f2d22cf7d30d3854cd0364fd809983d
      
https://github.com/qemu/qemu/commit/48e33de58f2d22cf7d30d3854cd0364fd809983d
  Author: Bruce Rogers <brogers@suse.com>
  Date:   2020-08-27 (Thu, 27 Aug 2020)

  Changed paths:
    M chardev/meson.build

  Log Message:
  -----------
  meson: Fix chardev-baum.so name

Somehow in the conversion to meson, the module named chardev-baum got
renamed to chardev-brlapi. Change it back.

Signed-off-by: Bruce Rogers <brogers@suse.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: fb648e9cacf4209ddaa8ee67d1a87a9b78a001c6
      
https://github.com/qemu/qemu/commit/fb648e9cacf4209ddaa8ee67d1a87a9b78a001c6
  Author: Daniel P. Berrangé <berrange@redhat.com>
  Date:   2020-08-27 (Thu, 27 Aug 2020)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: default to PIE disabled on Windows platforms

If Windows EXE files are built with -pie/-fpie they will fail to
launch. Historically QEMU defaulted to disabling PIE for Windows,
but this setting was accidentally lost when the configure summary
text was removed in

  commit f9332757898a764d85e19d339ec421236e885b68
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   Mon Feb 3 13:28:38 2020 +0100

    meson: move summary to meson.build

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

Fixes: f9332757898a764d85e19d339ec421236e885b68
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: b7612f45da9ea3ff3488a34f2ffd39d0d94713fb
      
https://github.com/qemu/qemu/commit/b7612f45da9ea3ff3488a34f2ffd39d0d94713fb
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-08-27 (Thu, 27 Aug 2020)

  Changed paths:
    M configure
    M contrib/vhost-user-gpu/meson.build
    M meson.build
    M ui/meson.build

  Log Message:
  -----------
  meson: move pixman detection to meson

When pixman is not installed (or too old), but virglrenderer is available
and "configure" has been run with "--disable-system", the build currently
aborts when trying to compile vhost-user-gpu (since it requires pixman).

Let's skip the build of vhost-user-gpu when pixman is not installed or
too old.  Instead of adding CONFIG_PIXMAN, it is simpler to move the
detection to pixman.

Based on a patch by Thomas Huth. <thuth@redhat.com>

Fixes: 9b52b17ba5 ("configure: Allow to build tools without pixman")
Reported-by: Rafael Kitover <rkitover@gmail.com>
Reported-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 760e4327cd88a079a0688a46b13746eda0d7da23
      
https://github.com/qemu/qemu/commit/760e4327cd88a079a0688a46b13746eda0d7da23
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-08-27 (Thu, 27 Aug 2020)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson: skip SDL2 detection if --disable-system

SDL is only used for system emulation; avoid spurious warnings for
static --disable-system emulation by skipping the detection of
the library if there are no system emulation targets.

Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 48328880fddf0145bdccc499160fb24dfabfbd41
      
https://github.com/qemu/qemu/commit/48328880fddf0145bdccc499160fb24dfabfbd41
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-08-27 (Thu, 27 Aug 2020)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: add --ninja option

On Windows it is not possible to invoke a Python script as $NINJA.
If ninja is present use it directly, while if it is not we can
keep using ninjatool.

Reported-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 1917ec6d564d3fae404adedcbb6e8a724fba8894
      
https://github.com/qemu/qemu/commit/1917ec6d564d3fae404adedcbb6e8a724fba8894
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-08-27 (Thu, 27 Aug 2020)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson: cleanup xkbcommon detection

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


  Commit: ec14f888b875943cceefda214eeed27c6c6440a6
      
https://github.com/qemu/qemu/commit/ec14f888b875943cceefda214eeed27c6c6440a6
  Author: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
  Date:   2020-08-27 (Thu, 27 Aug 2020)

  Changed paths:
    M ui/meson.build

  Log Message:
  -----------
  meson: don't require CONFIG_VTE for the GTK UI

Prevously CONFIG_VTE was not required to build QEMU with GTK UI support as not
all platforms have VTE available (in particular Windows).

Remove this requirement from the meson build system to enable QEMU to be built
with GTK UI support for Windows once again.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 1a4db552d8ee7efe9202f712de874e52900a5915
      
https://github.com/qemu/qemu/commit/1a4db552d8ee7efe9202f712de874e52900a5915
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-08-27 (Thu, 27 Aug 2020)

  Changed paths:
    M scripts/ninjatool.py

  Log Message:
  -----------
  ninjatool: quote dollars in variables

Otherwise, dollars (such as in the special $ORIGIN rpath) are
eaten by Make.

Reported-by: Laurent Vivier <lvivier@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: cb23fd474035f7232a462dbcad8e61e6b1fa12f1
      
https://github.com/qemu/qemu/commit/cb23fd474035f7232a462dbcad8e61e6b1fa12f1
  Author: Yonggang Luo <luoyonggang@gmail.com>
  Date:   2020-08-27 (Thu, 27 Aug 2020)

  Changed paths:
    M scripts/mtest2make.py

  Log Message:
  -----------
  meson: fix relpath failure on Win32

On win32, os.path.relpath can raise an exception when computing
for example C:/msys64/mingw64/x.exe relative to E:/path/qemu-build.
Use try...except to avoid this, just using an absolute path in
this case.

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 363743dacb5e6b0949dd2bc305bafc9594d2c799
      
https://github.com/qemu/qemu/commit/363743dacb5e6b0949dd2bc305bafc9594d2c799
  Author: Yonggang Luo <luoyonggang@gmail.com>
  Date:   2020-08-27 (Thu, 27 Aug 2020)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson: Mingw64 gcc doesn't recognize system include_type for sdl2

Windows paths result in command lines like "-isystemC:/msys64/..." that
are not recognized by GCC.  "include_type: 'system'" was only included
in an attempt to fix the -Wundef warnings in SDL 2.0.8, but it was not
effective.  Therefore we can fix this by remove the include_type.

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 90756b2fb3b95df754008024e84e7f164718bf2f
      
https://github.com/qemu/qemu/commit/90756b2fb3b95df754008024e84e7f164718bf2f
  Author: Gerd Hoffmann <kraxel@redhat.com>
  Date:   2020-08-27 (Thu, 27 Aug 2020)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson: set colorout to auto

Dunno why the default is set to "always".  IMHO it should be "auto",
i.e. only colorize in case stdout goes to a terminal.  Cluttering
logfiles and confusing compiler message parsers with terminal control
sequences is not nice ...

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 74938f0645e25f191247af55d7bf27d9c62f4768
      
https://github.com/qemu/qemu/commit/74938f0645e25f191247af55d7bf27d9c62f4768
  Author: Yonggang Luo <luoyonggang@gmail.com>
  Date:   2020-08-27 (Thu, 27 Aug 2020)

  Changed paths:
    M scripts/ninjatool.py

  Log Message:
  -----------
  ninjatool: Fixes E$$: in generated Makefile.ninja

Even though SIMPLE_PATH_RE is used with re.match (which anchors the
match implictly to the beginning of the string) it also needs an
end-of-string anchor in order to match the full path token.

Otherwise, the match would succeed incorrectly for $ and : characters
contained in the path, for example if the path starts with C:/ or E:/.

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Tested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 332657245b59952306715bdf696037cb7ea35919
      
https://github.com/qemu/qemu/commit/332657245b59952306715bdf696037cb7ea35919
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-08-27 (Thu, 27 Aug 2020)

  Changed paths:
    M chardev/meson.build
    M configure
    M contrib/vhost-user-gpu/meson.build
    M meson.build
    M scripts/mtest2make.py
    M scripts/ninjatool.py
    M scripts/qemu-version.sh
    M trace/meson.build
    M ui/meson.build

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

meson fixes:
* fix PIE default for Windows
* tweak conditions for requiring SDL2 and pixman
* move NSIS building to Meson
* fix creation of systemtap files
* add --ninja option for Windows builds
* other fixes for stupid bugs and for Windows paths

meson related:
* forward port of dtrace fix for MacOS
* change colorout option to auto

# gpg: Signature made Thu 27 Aug 2020 17:58:21 BST
# 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:
  ninjatool: Fixes E$$: in generated Makefile.ninja
  meson: set colorout to auto
  meson: Mingw64 gcc doesn't recognize system include_type for sdl2
  meson: fix relpath failure on Win32
  ninjatool: quote dollars in variables
  meson: don't require CONFIG_VTE for the GTK UI
  meson: cleanup xkbcommon detection
  configure: add --ninja option
  meson: skip SDL2 detection if --disable-system
  meson: move pixman detection to meson
  configure: default to PIE disabled on Windows platforms
  meson: Fix chardev-baum.so name
  meson: Fix meson build with --enable-libdaxctl
  scripts/qemu-version.sh: Add missing space before ']'
  meson: Don't make object files for dtrace on macOS
  meson: Build qemu-nbd on macOS again
  trace: fix creation of systemtap files

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/19591e9e0938...332657245b59