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>

diff --cc meson.build
index b349c9bda8140f88c3f3df1419031de38d52ac6e,61919c024ab5a244b8a04ab16f8509c27cdf21fc..835424999de0372bed600d80acfe886ee69749b7
--- 1/meson.build
--- 2/meson.build
+++ b/meson.build
@@@ -1633,10 -1656,10 +1669,10 @@@ foreach m : block_mods + softmmu_mod
                  name_prefix: '',
                  link_whole: m,
                  install: true,
-                 install_dir: config_host['qemu_moddir'])
+                 install_dir: qemu_moddir)
  endforeach
  
 -softmmu_ss.add(authz, block, chardev, crypto, io, qmp)
 +softmmu_ss.add(authz, blockdev, chardev, crypto, io, qmp)
  common_ss.add(qom, qemuutil)
  
  common_ss.add_all(when: 'CONFIG_SOFTMMU', if_true: [softmmu_ss])

diff --cc softmmu/vl.c
Simple merge

diff --cc stubs/meson.build
Simple merge

diff --cc tests/qtest/meson.build
Simple merge