The following changes since commit 4c5b97bfd0dd54dc27717ae8d1cd10e14eef1430:

  Merge remote-tracking branch 'remotes/kraxel/tags/modules-20201022-pull-request' into staging (2020-10-22 12:33:21 +0100)

are available in the Git repository at:

  https://gitlab.com/bonzini/qemu.git tags/for-upstream

for you to fetch changes up to 8b0e484c8bf82e07bb0439bff04e248c63cdc86a:

  machine: move SMP initialization from vl.c (2020-10-26 07:08:40 -0400)

----------------------------------------------------------------
* 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)

----------------------------------------------------------------
Claudio Fontana (2):
      qtest: unbreak non-TCG builds in bios-tables-test
      replay: do not build if TCG is not available

Luc Michel (1):
      hw/core/qdev-clock: add a reference on aliased clocks

Paolo Bonzini (11):
      build: fix macOS --enable-modules build
      meson: rewrite curses/iconv test
      do not use colons in test names
      Makefile: separate meson rerun from the rest of the ninja invocation
      configure: allow configuring localedir
      configure: move directory options from config-host.mak to meson
      configure: remove unused variable from config-host.mak
      configure: move install_blobs from configure to meson
      machine: remove deprecated -machine enforce-config-section option
      machine: move UP defaults to class_base_init
      machine: move SMP initialization from vl.c

Sunil Muthuswamy (2):
      WHPX: Fix WHPX build break
      win32: boot broken when bind & data dir are the same

Thomas Huth (1):
      Remove deprecated -no-kvm option

 .cirrus.yml                        |   2 +-
 Makefile                           |  44 ++++++---
 block/meson.build                  |   3 +-
 configure                          |  64 +++----------
 contrib/vhost-user-gpu/meson.build |   2 +-
 docs/system/deprecated.rst         |  23 ++---
 hw/core/machine.c                  |  36 +++-----
 hw/core/qdev-clock.c               |   8 ++
 include/hw/boards.h                |   1 -
 meson.build                        | 178 ++++++++++++++++++++++---------------
 meson_options.txt                  |   4 +
 migration/migration.c              |  10 ---
 net/meson.build                    |   3 +-
 pc-bios/descriptors/meson.build    |   4 +-
 pc-bios/meson.build                |  15 ++--
 qemu-options.hx                    |  11 ---
 replay/meson.build                 |   4 +-
 replay/stubs-system.c              |  96 ++++++++++++++++++++
 scripts/undefsym.py                |  11 ++-
 softmmu/vl.c                       |  16 ----
 stubs/meson.build                  |   4 +-
 stubs/replay-tools.c               |  83 +++++++++++++++++
 stubs/replay-user.c                |   9 --
 stubs/replay.c                     |  78 ----------------
 tests/fp/meson.build               |   6 +-
 tests/ptimer-test-stubs.c          |   5 --
 tests/qtest/bios-tables-test.c     |  10 +++
 tests/qtest/meson.build            |   2 +-
 tests/qtest/qmp-cmd-test.c         |   3 +
 tools/virtiofsd/meson.build        |   2 +-
 ui/icons/meson.build               |   6 +-
 ui/meson.build                     |   2 +-
 util/cutils.c                      |   2 +-
 version.texi.in                    |   2 -
 34 files changed, 416 insertions(+), 333 deletions(-)
 create mode 100644 replay/stubs-system.c
 create mode 100644 stubs/replay-tools.c
 delete mode 100644 stubs/replay-user.c
 delete mode 100644 version.texi.in
-- 
2.26.2

On Mon, 26 Oct 2020 at 14:04, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> The following changes since commit 4c5b97bfd0dd54dc27717ae8d1cd10e14eef1430:
>
>   Merge remote-tracking branch 'remotes/kraxel/tags/modules-20201022-pull-request' into staging (2020-10-22 12:33:21 +0100)
>
> are available in the Git repository at:
>
>   https://gitlab.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to 8b0e484c8bf82e07bb0439bff04e248c63cdc86a:
>
>   machine: move SMP initialization from vl.c (2020-10-26 07:08:40 -0400)
>
> ----------------------------------------------------------------
> * 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)
>
> ----------------------------------------------------------------


Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/5.2
for any user-visible changes.

-- PMM

This pull request confused me, the windows msys2 build time slow down from
40min to more than one hour.

On Tue, Oct 27, 2020 at 1:54 AM Peter Maydell <peter.maydell@linaro.org>
wrote:
>
> On Mon, 26 Oct 2020 at 14:04, Paolo Bonzini <pbonzini@redhat.com> wrote:
> >
> > The following changes since commit
4c5b97bfd0dd54dc27717ae8d1cd10e14eef1430:
> >
> >   Merge remote-tracking branch
'remotes/kraxel/tags/modules-20201022-pull-request' into staging
(2020-10-22 12:33:21 +0100)
> >
> > are available in the Git repository at:
> >
> >   https://gitlab.com/bonzini/qemu.git tags/for-upstream
> >
> > for you to fetch changes up to 8b0e484c8bf82e07bb0439bff04e248c63cdc86a:
> >
> >   machine: move SMP initialization from vl.c (2020-10-26 07:08:40 -0400)
> >
> > ----------------------------------------------------------------
> > * 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)
> >
> > ----------------------------------------------------------------
>
>
> Applied, thanks.
>
> Please update the changelog at https://wiki.qemu.org/ChangeLog/5.2
> for any user-visible changes.
>
> -- PMM
>


--
         此致
礼
罗勇刚
Yours
    sincerely,
Yonggang Luo

Il lun 26 ott 2020, 19:59 罗勇刚(Yonggang Luo) <luoyonggang@gmail.com> ha
scritto:

> This pull request confused me, the windows msys2 build time slow down from
> 40min to more than one hour.
>

Probably just the cache being rebuilt. Cirrus CI times seem to vary a lot
but 40min and 1h5min seem to be the common cases before or after these
changes:

https://cirrus-ci.com/task/5531259461959680
With this PR: 35+2 (build+test)

https://cirrus-ci.com/task/4570682912669696
With this PR: 10+4

https://cirrus-ci.com/task/6662289128423424
With this PR: 35+2, +20 to rebuild cirrus cache

https://cirrus-ci.com/task/5383432727429120
Without this PR: 30+2, +18 to rebuild cirrus cache

Paolo

>

On Tue, Oct 27, 2020 at 4:58 AM Paolo Bonzini <pbonzini@redhat.com> wrote:
>
>
>
> Il lun 26 ott 2020, 19:59 罗勇刚(Yonggang Luo) <luoyonggang@gmail.com> ha
scritto:
>>
>> This pull request confused me, the windows msys2 build time slow down
from 40min to more than one hour.
>
>
> Probably just the cache being rebuilt. Cirrus CI times seem to vary a lot
but 40min and 1h5min seem to be the common cases before or after these
changes:
>
> https://cirrus-ci.com/task/5531259461959680
> With this PR: 35+2 (build+test)
>
> https://cirrus-ci.com/task/4570682912669696
> With this PR: 10+4
>
> https://cirrus-ci.com/task/6662289128423424
> With this PR: 35+2, +20 to rebuild cirrus cache
>
> https://cirrus-ci.com/task/5383432727429120
> Without this PR: 30+2, +18 to rebuild cirrus cache
>
> Paolo
That's correct, cirrus's building time are not stable. My own build are
already passed.
https://cirrus-ci.com/task/5357017537708032, if the cache are works, then
it's definitely won't exceed the time


--
         此致
礼
罗勇刚
Yours
    sincerely,
Yonggang Luo