[Qemu-commits] [qemu/qemu] da0dfe: build: fix macOS --enable-modules build

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: da0dfe251d7216ffbee72c7e0ae0709ba9b422e6
      
https://github.com/qemu/qemu/commit/da0dfe251d7216ffbee72c7e0ae0709ba9b422e6
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-10-22 (Thu, 22 Oct 2020)

  Changed paths:
    M .cirrus.yml
    M scripts/undefsym.py

  Log Message:
  -----------
  build: fix macOS --enable-modules build

Apple's nm implementation includes empty lines in the output that are not
found in GNU binutils.  This confuses scripts/undefsym.py, though it did
not confuse the scripts/undefsym.sh script that it replaced.  To fix
this, ignore lines that do not have two fields.

Reported-by: Emmanuel Blot <eblot.ml@gmail.com>
Tested-by: Emmanuel Blot <eblot.ml@gmail.com>
Fixes: 604f3e4e90 ("meson: Convert undefsym.sh to undefsym.py", 2020-09-08)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 925a40df2828d32d3aaaf022282cba81082fb263
      
https://github.com/qemu/qemu/commit/925a40df2828d32d3aaaf022282cba81082fb263
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-10-22 (Thu, 22 Oct 2020)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  meson: rewrite curses/iconv test

Redo the curses test to do the same tests that the configure
check used to do.  OpenBSD triggers the warning because
it does not support NCURSES_WIDECHAR and thus the cc.links
test fails.

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


  Commit: 34f02e9f334956cef4e3af4433aaebe7e5ecf71f
      
https://github.com/qemu/qemu/commit/34f02e9f334956cef4e3af4433aaebe7e5ecf71f
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-10-22 (Thu, 22 Oct 2020)

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

  Log Message:
  -----------
  do not use colons in test names

Starting with meson 0.56, colons are used to separate the subproject name
from the test name.  Use dash or slash depending on what looks nicer.

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


  Commit: a6e9b9123e7e24085b16a001a04f9059269c57c5
      
https://github.com/qemu/qemu/commit/a6e9b9123e7e24085b16a001a04f9059269c57c5
  Author: Luc Michel <luc@lmichel.fr>
  Date:   2020-10-22 (Thu, 22 Oct 2020)

  Changed paths:
    M hw/core/qdev-clock.c

  Log Message:
  -----------
  hw/core/qdev-clock: add a reference on aliased clocks

When aliasing a clock with the qdev_alias_clock() function, a new link
property is created on the device aliasing the clock. The link points
to the aliased clock and use the OBJ_PROP_LINK_STRONG flag. This
property is read only since it does not provide a check callback for
modifications.

The object_property_add_link() documentation stats that with
OBJ_PROP_LINK_STRONG properties, the linked object reference count get
decremented when the property is deleted. But it is _not_ incremented on
creation (object_property_add_link() does not actually know the link).

This commit increments the reference count on the aliased clock to
ensure the aliased clock stays alive during the property lifetime, and
to avoid a double-free memory error when the property gets deleted.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Luc Michel <luc@lmichel.fr>
Message-Id: <20201020091024.320381-1-luc@lmichel.fr>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: c51a5a23d87be2cfd8e2d739d11475b251f398cb
      
https://github.com/qemu/qemu/commit/c51a5a23d87be2cfd8e2d739d11475b251f398cb
  Author: Claudio Fontana <cfontana@suse.de>
  Date:   2020-10-22 (Thu, 22 Oct 2020)

  Changed paths:
    M tests/qtest/bios-tables-test.c

  Log Message:
  -----------
  qtest: unbreak non-TCG builds in bios-tables-test

the tests assume TCG is available, thus breaking
for TCG-only tests, where only the TCG accelerator option
is passed to the QEMU binary.

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Message-Id: <20201013192123.22632-3-cfontana@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 9b1c911654e9d4937f10cb347cf581d50771ee5b
      
https://github.com/qemu/qemu/commit/9b1c911654e9d4937f10cb347cf581d50771ee5b
  Author: Claudio Fontana <cfontana@suse.de>
  Date:   2020-10-22 (Thu, 22 Oct 2020)

  Changed paths:
    M block/meson.build
    M net/meson.build
    M replay/meson.build
    A replay/stubs-system.c
    M stubs/meson.build
    A stubs/replay-tools.c
    R stubs/replay-user.c
    M stubs/replay.c
    M tests/ptimer-test-stubs.c
    M tests/qtest/qmp-cmd-test.c

  Log Message:
  -----------
  replay: do not build if TCG is not available

this fixes non-TCG builds broken recently by replay reverse debugging.

Stub the needed functions in stub/, splitting roughly between functions
needed only by system emulation, by system emulation and tools,
and by everyone.  This includes duplicating some code in replay/, and
puts the logic for non-replay related events in the replay/ module (+
the stubs), so this should be revisited in the future.

Surprisingly, only _one_ qtest was affected by this, ide-test.c, which
resulted in a buzz as the bh events were never delivered, and the bh
never executed.

Many other subsystems _should_ have been affected.

This fixes the immediate issue, however a better way to group replay
functionality to TCG-only code could be developed in the long term.

Signed-off-by: Claudio Fontana <cfontana@suse.de>
Message-Id: <20201013192123.22632-4-cfontana@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 7239c050e81ad4aad282f8d43848c14b3956838a
      
https://github.com/qemu/qemu/commit/7239c050e81ad4aad282f8d43848c14b3956838a
  Author: Thomas Huth <thuth@redhat.com>
  Date:   2020-10-22 (Thu, 22 Oct 2020)

  Changed paths:
    M docs/system/deprecated.rst
    M qemu-options.hx
    M softmmu/vl.c

  Log Message:
  -----------
  Remove deprecated -no-kvm option

The option has never been mentioned in our documentation, it's been
deprecated since years, it's marked with QEMU_ARCH_I386 (which does
not make sense anymore since KVM is available on other architectures,
too), it does not do anything by default in upstream QEMU (since TCG
is the default here anyway), and we're spending too much precious time
each year discussing whether it makes sense to keep this option as a
nice suger or not... let's finally put an end on this and remove it.

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


  Commit: 5914ef77cc1bd4c3d79ccd3e3f82f34604275b93
      
https://github.com/qemu/qemu/commit/5914ef77cc1bd4c3d79ccd3e3f82f34604275b93
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-10-26 (Mon, 26 Oct 2020)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Makefile: separate meson rerun from the rest of the ninja invocation

The rules to build Makefile.mtest are suffering from the "tunnel vision"
problem that is common with recursive makefiles.  Makefile.mtest depends
on build.ninja, but Make does not know when build.ninja needs to be
rebuilt before creating Makefile.mtest.

To fix this, separate the ninja invocation into the "regenerate build
files" phase and the QEMU build phase.  Sentinel files such as
meson-private/coredata.dat or build.ninja are used to figure out the
phases that haven't run yet; however, because those files' timestamps
are not guaranteed to be touched, the usual makefile stamp-file trick
is used on top.

Reported-by: Havard Skinnemoen <hskinnemoen@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: fe0038bec26fdac2256db43894d55d1a6f798c0f
      
https://github.com/qemu/qemu/commit/fe0038bec26fdac2256db43894d55d1a6f798c0f
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-10-26 (Mon, 26 Oct 2020)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: allow configuring localedir

Meson has a localedir option, so passing the path through that option
is the cleanest way when we move directories out of config-host.mak.
In preparation for doing that without changing semantics and without
special-casing localedir code, add a configure option.

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


  Commit: 16bf7a3326d8e8be42b3bf844a6c539d52a997b3
      
https://github.com/qemu/qemu/commit/16bf7a3326d8e8be42b3bf844a6c539d52a997b3
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-10-26 (Mon, 26 Oct 2020)

  Changed paths:
    M Makefile
    M configure
    M contrib/vhost-user-gpu/meson.build
    M meson.build
    M meson_options.txt
    M pc-bios/descriptors/meson.build
    M pc-bios/meson.build
    M tools/virtiofsd/meson.build
    M ui/icons/meson.build
    M ui/meson.build
    R version.texi.in

  Log Message:
  -----------
  configure: move directory options from config-host.mak to meson

Since installation is not part of Makefiles anymore, Make need not
know the directories anymore.  Meson already knows them through
built-in options, do everything using them instead of the config_host
dictionary.

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


  Commit: b37f357abfc5a52f613643502e93e0f453c79ef8
      
https://github.com/qemu/qemu/commit/b37f357abfc5a52f613643502e93e0f453c79ef8
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-10-26 (Mon, 26 Oct 2020)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: remove unused variable from config-host.mak

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


  Commit: c8d5450bba38560193f5648f5337199d797c5208
      
https://github.com/qemu/qemu/commit/c8d5450bba38560193f5648f5337199d797c5208
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-10-26 (Mon, 26 Oct 2020)

  Changed paths:
    M configure
    M meson.build
    M meson_options.txt
    M pc-bios/descriptors/meson.build
    M pc-bios/meson.build

  Log Message:
  -----------
  configure: move install_blobs from configure to meson

Move the conditions under which edk2 blobs are decompressed
and installed to pc-bios/meson.build.

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


  Commit: 57e2a1f82c6cf37cbf164d0824cca692e0db7133
      
https://github.com/qemu/qemu/commit/57e2a1f82c6cf37cbf164d0824cca692e0db7133
  Author: Sunil Muthuswamy <sunilmut@microsoft.com>
  Date:   2020-10-26 (Mon, 26 Oct 2020)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  WHPX: Fix WHPX build break

With upstream commit#8a19980e3fc4, logic was introduced to only
allow WHPX build on x64. But, the logic checks for the cpu family
and not the cpu. On my fedora container build, the cpu family is
x86 and the cpu is x86_64. Fixing the build break by checking for
the cpu, instead of the cpu family.

Signed-off-by: Sunil Muthuswamy <sunilmut@microsoft.com>
Message-Id: 
<SN4PR2101MB0880D706A85793DDFC411304C01D0@SN4PR2101MB0880.namprd21.prod.outlook.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 7a3b7f6b94e16c0526587853a2cc954387882389
      
https://github.com/qemu/qemu/commit/7a3b7f6b94e16c0526587853a2cc954387882389
  Author: Sunil Muthuswamy <sunilmut@microsoft.com>
  Date:   2020-10-26 (Mon, 26 Oct 2020)

  Changed paths:
    M util/cutils.c

  Log Message:
  -----------
  win32: boot broken when bind & data dir are the same

With upstream commit#ea1edcd7da1a "vl: relocate paths to data
directories", the data dir logic was unified between POSIX &
Win32. That patch moved to using 'get_relocated_path()', to
find the data dir. There is a latent bug in get_relocated_path
which can cause it to spin indefinitely, when the bind dir is
the same as the passed in dir (in this case, it was the data
dir).

Signed-off-by: Sunil Muthuswamy <sunilmut@microsoft.com>
Message-Id: 
<SN4PR2101MB08802BF242C429A15DDB32ACC01B0@SN4PR2101MB0880.namprd21.prod.outlook.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 9f2931bc65ea7a453b8778e00c3c825923d97b75
      
https://github.com/qemu/qemu/commit/9f2931bc65ea7a453b8778e00c3c825923d97b75
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-10-26 (Mon, 26 Oct 2020)

  Changed paths:
    M docs/system/deprecated.rst
    M hw/core/machine.c
    M include/hw/boards.h
    M migration/migration.c
    M qemu-options.hx

  Log Message:
  -----------
  machine: remove deprecated -machine enforce-config-section option

Deprecated since 3.1 and complicates the initialization sequence,
remove it.

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


  Commit: 2c920e4577b29702c0c01b0d491903c159df894a
      
https://github.com/qemu/qemu/commit/2c920e4577b29702c0c01b0d491903c159df894a
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-10-26 (Mon, 26 Oct 2020)

  Changed paths:
    M hw/core/machine.c
    M softmmu/vl.c

  Log Message:
  -----------
  machine: move UP defaults to class_base_init

Clean up vl.c, default min/max/default_cpus to uniprocessor
directly in the QOM class initialization code.

Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: 8b0e484c8bf82e07bb0439bff04e248c63cdc86a
      
https://github.com/qemu/qemu/commit/8b0e484c8bf82e07bb0439bff04e248c63cdc86a
  Author: Paolo Bonzini <pbonzini@redhat.com>
  Date:   2020-10-26 (Mon, 26 Oct 2020)

  Changed paths:
    M hw/core/machine.c
    M softmmu/vl.c

  Log Message:
  -----------
  machine: move SMP initialization from vl.c

Initialize the object's values from the class when the object is
created, no need to have vl.c do it for us.

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


  Commit: a95e0396c805735c491a049b01de6f5a713fb91b
      
https://github.com/qemu/qemu/commit/a95e0396c805735c491a049b01de6f5a713fb91b
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-10-26 (Mon, 26 Oct 2020)

  Changed paths:
    M .cirrus.yml
    M Makefile
    M block/meson.build
    M configure
    M contrib/vhost-user-gpu/meson.build
    M docs/system/deprecated.rst
    M hw/core/machine.c
    M hw/core/qdev-clock.c
    M include/hw/boards.h
    M meson.build
    M meson_options.txt
    M migration/migration.c
    M net/meson.build
    M pc-bios/descriptors/meson.build
    M pc-bios/meson.build
    M qemu-options.hx
    M replay/meson.build
    A replay/stubs-system.c
    M scripts/undefsym.py
    M softmmu/vl.c
    M stubs/meson.build
    A stubs/replay-tools.c
    R stubs/replay-user.c
    M stubs/replay.c
    M tests/fp/meson.build
    M tests/ptimer-test-stubs.c
    M tests/qtest/bios-tables-test.c
    M tests/qtest/meson.build
    M tests/qtest/qmp-cmd-test.c
    M tools/virtiofsd/meson.build
    M ui/icons/meson.build
    M ui/meson.build
    M util/cutils.c
    R version.texi.in

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

* fix --disable-tcg builds (Claudio)
* Fixes for macOS --enable-modules build and OpenBSD curses/iconv detection 
(myself)
* Start preparing for meson 0.56 (myself)
* Move directory configuration to meson (myself)
* Start untangling qemu_init (myself)
* Windows fixes (Sunil)
* Remove -no-kbm (Thomas)

# gpg: Signature made Mon 26 Oct 2020 11:12:17 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:
  machine: move SMP initialization from vl.c
  machine: move UP defaults to class_base_init
  machine: remove deprecated -machine enforce-config-section option
  win32: boot broken when bind & data dir are the same
  WHPX: Fix WHPX build break
  configure: move install_blobs from configure to meson
  configure: remove unused variable from config-host.mak
  configure: move directory options from config-host.mak to meson
  configure: allow configuring localedir
  Makefile: separate meson rerun from the rest of the ninja invocation
  Remove deprecated -no-kvm option
  replay: do not build if TCG is not available
  qtest: unbreak non-TCG builds in bios-tables-test
  hw/core/qdev-clock: add a reference on aliased clocks
  do not use colons in test names
  meson: rewrite curses/iconv test
  build: fix macOS --enable-modules build

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


Compare: https://github.com/qemu/qemu/compare/a46e72710566...a95e0396c805