From: Richard Henderson Date: Mon, 20 Dec 2021 00:36:10 +0000 (-0800) Subject: Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=212a33d3b0c65ae2583bb1d06cb140cd0890894c;p=qemu.git Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging * configure and meson cleanups and fixes * remove unnecessary #ifdef * SCSI and i386 fixes # gpg: Signature made Sat 18 Dec 2021 02:00:22 AM PST # gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83 # gpg: issuer "pbonzini@redhat.com" # gpg: Good signature from "Paolo Bonzini " [unknown] # gpg: aka "Paolo Bonzini " [unknown] # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # 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 * tag 'for-upstream' of https://gitlab.com/bonzini/qemu: hw/i386/vmmouse: Require 'i8042' property to be set tests/qtest/fuzz-megasas-test: Add test for GitLab issue #521 hw/scsi/megasas: Fails command if SGL buffer overflows hw/scsi: Fix scsi_bus_init_named() docstring meson: add "check" argument to run_command cpu: remove unnecessary #ifdef CONFIG_TCG meson: reenable test-fdmon-epoll configure: remove DIRS configure: remove unnecessary symlinks configure, meson: move ARCH to meson.build meson: rename "arch" variable configure: unify x86_64 and x32 configure: unify ppc64 and ppc64le configure: unify two case statements on $cpu configure: move target detection before CPU detection configure: make $targetos lowercase, use windows instead of MINGW32 Signed-off-by: Richard Henderson --- 212a33d3b0c65ae2583bb1d06cb140cd0890894c