From: Peter Maydell <peter.maydell@linaro.org>
Date: Mon, 5 Oct 2020 12:12:55 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=0ac0b47c44b4be6cbce26777a1a5968cc8f025a5;p=qemu.git

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

* move target configuration to default-configs/targets (myself)
* Memory failure event (Zhenwei)

# gpg: Signature made Mon 05 Oct 2020 08:14:29 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:
  dockerfiles: add diffutils to Fedora
  tests: tcg: do not use implicit rules
  target-i386: post memory failure event to QMP
  qapi/run-state.json: introduce memory failure event
  target-i386: seperate MCIP & MCE_MASK error reason
  meson: move sparse detection to Meson and rewrite check_sparse.py
  default-configs: remove redundant keys
  default-configs: use TARGET_ARCH key
  configure: move OpenBSD W^X test to meson
  default-configs: remove default-configs/devices for user-mode targets
  configure: remove target configuration
  configure: remove useless config-target.mak symbols
  configure: compute derivatives of target name in meson
  configure: remove dead variable
  configure: move accelerator logic to meson
  configure: rewrite accelerator defaults as tests
  configure: convert accelerator variables to meson options
  default-configs: move files to default-configs/devices/
  travis: remove TCI test

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

# Conflicts:
#	configure
---

0ac0b47c44b4be6cbce26777a1a5968cc8f025a5
diff --cc configure
index f46f433649,baa245b5ad..66641099fc
--- a/configure
+++ b/configure
@@@ -7619,7 -7183,17 +7138,11 @@@ don
  if [ "$fdt" = "git" ]; then
    subdirs="$subdirs dtc"
  fi
 -if [ "$capstone" = "git" -o "$capstone" = "internal" ]; then
 -  subdirs="$subdirs capstone"
 -fi
+ echo "CONFIG_QEMU_INTERP_PREFIX=$interp_prefix" | sed 's/%M/@0@/' >> $config_host_mak
+ if test "$default_targets" = "yes"; then
+   echo "CONFIG_DEFAULT_TARGETS=y" >> $config_host_mak
+ fi
  echo "SUBDIRS=$subdirs" >> $config_host_mak
 -if test -n "$LIBCAPSTONE"; then
 -  echo "LIBCAPSTONE=$LIBCAPSTONE" >> $config_host_mak
 -fi
  
  if test "$numa" = "yes"; then
    echo "CONFIG_NUMA=y" >> $config_host_mak
@@@ -7792,11 -7366,12 +7315,13 @@@ NINJA=${ninja:-$PWD/ninjatool} $meson s
          -Dstrip=$(if test "$strip_opt" = yes; then echo true; else echo false; fi) \
          -Db_pie=$(if test "$pie" = yes; then echo true; else echo false; fi) \
          -Db_coverage=$(if test "$gcov" = yes; then echo true; else echo false; fi) \
- 	-Dmalloc=$malloc -Dmalloc_trim=$malloc_trim \
+ 	-Dmalloc=$malloc -Dmalloc_trim=$malloc_trim -Dsparse=$sparse \
+ 	-Dkvm=$kvm -Dhax=$hax -Dwhpx=$whpx -Dhvf=$hvf \
+ 	-Dxen=$xen -Dxen_pci_passthrough=$xen_pci_passthrough -Dtcg=$tcg \
  	-Dcocoa=$cocoa -Dmpath=$mpath -Dsdl=$sdl -Dsdl_image=$sdl_image \
  	-Dvnc=$vnc -Dvnc_sasl=$vnc_sasl -Dvnc_jpeg=$vnc_jpeg -Dvnc_png=$vnc_png \
 -	-Dgettext=$gettext -Dxkbcommon=$xkbcommon -Du2f=$u2f\
 +	-Dgettext=$gettext -Dxkbcommon=$xkbcommon -Du2f=$u2f \
 +	-Dcapstone=$capstone \
          $cross_arg \
          "$PWD" "$source_path"