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

* More SVM fixes (Lara)
* Module annotation database (Gerd)
* Memory leak fixes (myself)
* Build fixes (myself)
* --with-devices-* support (Alex)

# gpg: Signature made Fri 09 Jul 2021 17:23:52 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: (48 commits)
  meson: Use input/output for entitlements target
  configure: allow the selection of alternate config in the build
  configs: rename default-configs to configs and reorganise
  hw/arm: move CONFIG_V7M out of default-devices
  hw/arm: add dependency on OR_IRQ for XLNX_VERSAL
  meson: Introduce target-specific Kconfig
  meson: switch function tests from compilation to linking
  vl: fix leak of qdict_crumple return value
  target/i386: fix exceptions for MOV to DR
  target/i386: Added DR6 and DR7 consistency checks
  target/i386: Added MSRPM and IOPM size check
  monitor/tcg: move tcg hmp commands to accel/tcg, register them dynamically
  usb: build usb-host as module
  monitor/usb: register 'info usbhost' dynamically
  usb: drop usb_host_dev_is_scsi_storage hook
  monitor: allow register hmp commands
  accel: build tcg modular
  accel: add tcg module annotations
  accel: build qtest modular
  accel: add qtest module annotations
  ...

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

diff --cc MAINTAINERS
Simple merge

diff --cc configs/devices/arm-softmmu/default.mak
index 0000000000000000000000000000000000000000,4114aa9e3512b787b8ef684f2bdce62f58e51432..6985a25377a0a08952e81918ddd0fc97770aef1b
mode 000000,100644..100644
--- /dev/null
--- 2/configs/devices/arm-softmmu/default.mak
+++ b/configs/devices/arm-softmmu/default.mak
@@@ -1,0 -1,43 +1,44 @@@
+ # Default configuration for arm-softmmu
+ 
+ # CONFIG_PCI_DEVICES=n
+ # CONFIG_TEST_DEVICES=n
+ 
+ CONFIG_ARM_VIRT=y
+ CONFIG_CUBIEBOARD=y
+ CONFIG_EXYNOS4=y
+ CONFIG_HIGHBANK=y
+ CONFIG_INTEGRATOR=y
+ CONFIG_FSL_IMX31=y
+ CONFIG_MUSICPAL=y
+ CONFIG_MUSCA=y
+ CONFIG_CHEETAH=y
+ CONFIG_SX1=y
+ CONFIG_NSERIES=y
+ CONFIG_STELLARIS=y
++CONFIG_STM32VLDISCOVERY=y
+ CONFIG_REALVIEW=y
+ CONFIG_VERSATILE=y
+ CONFIG_VEXPRESS=y
+ CONFIG_ZYNQ=y
+ CONFIG_MAINSTONE=y
+ CONFIG_GUMSTIX=y
+ CONFIG_SPITZ=y
+ CONFIG_TOSA=y
+ CONFIG_Z2=y
+ CONFIG_NPCM7XX=y
+ CONFIG_COLLIE=y
+ CONFIG_ASPEED_SOC=y
+ CONFIG_NETDUINO2=y
+ CONFIG_NETDUINOPLUS2=y
+ CONFIG_MPS2=y
+ CONFIG_RASPI=y
+ CONFIG_DIGIC=y
+ CONFIG_SABRELITE=y
+ CONFIG_EMCRAFT_SF2=y
+ CONFIG_MICROBIT=y
+ CONFIG_FSL_IMX25=y
+ CONFIG_FSL_IMX7=y
+ CONFIG_FSL_IMX6UL=y
+ CONFIG_SEMIHOSTING=y
+ CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y
+ CONFIG_ALLWINNER_H3=y

diff --cc configs/devices/ppc-softmmu/default.mak
index 0000000000000000000000000000000000000000,c2d41198cde68586182d323702cad967b46f02b5..4535993d8d50df3d4895b38c99d21883f7cfa06d
mode 000000,100644..100644
--- /dev/null
--- 2/configs/devices/ppc-softmmu/default.mak
+++ b/configs/devices/ppc-softmmu/default.mak
@@@ -1,0 -1,20 +1,20 @@@
 -CONFIG_PEGASOS2=n
+ # Default configuration for ppc-softmmu
+ 
+ # For embedded PPCs:
+ CONFIG_DS1338=y
+ CONFIG_E500=y
+ CONFIG_PPC405=y
+ CONFIG_PPC440=y
+ CONFIG_VIRTEX=y
+ 
+ # For Sam460ex
+ CONFIG_SAM460EX=y
+ 
+ # For Macs
+ CONFIG_MAC_OLDWORLD=y
+ CONFIG_MAC_NEWWORLD=y
+ 
++CONFIG_PEGASOS2=y
+ 
+ # For PReP
+ CONFIG_PREP=y

diff --cc hw/arm/Kconfig
Simple merge

diff --cc hw/ppc/spapr.c
Simple merge

diff --cc meson.build
Simple merge