]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge tag 'pull-misc-20220103' of https://gitlab.com/rth7680/qemu into staging
authorRichard Henderson <richard.henderson@linaro.org>
Mon, 3 Jan 2022 17:34:41 +0000 (09:34 -0800)
committerRichard Henderson <richard.henderson@linaro.org>
Mon, 3 Jan 2022 17:34:41 +0000 (09:34 -0800)
Fix some meson conversion breakage
Disable check-python-tox
Fix emulation of hppa STBY insn

# gpg: Signature made Mon 03 Jan 2022 09:31:48 AM PST
# gpg:                using RSA key 7A481E78868B4DB6A85A05C064DF38E8AF7E215F
# gpg:                issuer "richard.henderson@linaro.org"
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [ultimate]

* tag 'pull-misc-20220103' of https://gitlab.com/rth7680/qemu:
  gitlab: Disable check-python-tox
  target/hppa: Fix atomic_store_3 for STBY
  tests/tcg: Unconditionally use 90 second timeout
  tests/tcg: Use $cpu in configure.sh
  meson: Unify mips and mips64 in host_arch

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

Trivial merge