From: Peter Maydell Date: Sun, 11 Jul 2021 21:20:51 +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=d1987c8114921eb30859854de664f879b5626da7;p=qemu.git 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 " [full] # gpg: aka "Paolo Bonzini " [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 --- d1987c8114921eb30859854de664f879b5626da7 diff --cc configs/devices/arm-softmmu/default.mak index 0000000000,4114aa9e35..6985a25377 mode 000000,100644..100644 --- a/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 0000000000,c2d41198cd..4535993d8d mode 000000,100644..100644 --- a/configs/devices/ppc-softmmu/default.mak +++ b/configs/devices/ppc-softmmu/default.mak @@@ -1,0 -1,20 +1,20 @@@ + # 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=n ++CONFIG_PEGASOS2=y + + # For PReP + CONFIG_PREP=y