From: Richard Henderson Date: Wed, 5 Jan 2022 16:47:18 +0000 (-0800) Subject: Merge tag 'pull-request-2022-01-05' of https://gitlab.com/thuth/qemu into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7d4ae4d4978079d564d3b6354c90a949130409fe;p=qemu.git Merge tag 'pull-request-2022-01-05' of https://gitlab.com/thuth/qemu into staging * Add compat machines for 7.0 * Some minor qtest and unit test improvements * Remove -no-quit option * Fixes for the docs # gpg: Signature made Wed 05 Jan 2022 02:10:49 AM PST # gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5 # gpg: issuer "thuth@redhat.com" # gpg: Good signature from "Thomas Huth " [undefined] # gpg: aka "Thomas Huth " [undefined] # gpg: aka "Thomas Huth " [unknown] # gpg: aka "Thomas Huth " [undefined] # 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: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5 * tag 'pull-request-2022-01-05' of https://gitlab.com/thuth/qemu: docs/tools/qemu-trace-stap.rst: Do not hard-code the QEMU binary name gitlab-ci: Enable docs in the centos job docs/sphinx: fix compatibility with sphinx < 1.8 qemu-options: Remove the deprecated -no-quit option tests/unit/test-util-sockets: Use g_file_open_tmp() to create temp file tests/qtest/hd-geo-test: Check for the lsi53c895a controller before using it tests/qtest/test-x86-cpuid-compat: Check for machines before using them hw: Add compat machines for 7.0 Signed-off-by: Richard Henderson --- 7d4ae4d4978079d564d3b6354c90a949130409fe