From: Richard Henderson Date: Wed, 31 Jul 2024 21:31:49 +0000 (+1000) Subject: Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e9d2db818ff934afb366aea566d0b33acf7bced1;p=qemu.git Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging * target/i386: qemu-vmsr-helper fixes * target/i386: mask off SGX/SGX_LC feature words for non-PC machine * tests/vm/openbsd: Install tomli * fix issue with 64-bit features (vmx kvm-unit-tests) # -----BEGIN PGP SIGNATURE----- # # iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAmaqHL4UHHBib256aW5p # QHJlZGhhdC5jb20ACgkQv/vSX3jHroPuuwgAhZwTHl1MkjIbIX7IRq39ORmOmk9a # vNqn32MLsUnSpV1JYrwzLgsNciTDhNkEL56Y4XwFbSUUyen0vvmcEH+/bCVKWb98 # jBk0iHXzfkk3GBd/ZLd4NW/LEeOZY4YBFNzyfhQGP47vSUAle/+VDdqukfJ9rj3J # o8Mx3YJjYcvoI21WZyhyLGdJtj/yBPwCfxrmhhJAWctIES78/sp1tP0UfmFcysss # nd7PrAoAXPc2MhBTJk7IwyXSJCnGnDsE4rQXqiVV+TN0S60Zcz+1jzqx0vgzHAk4 # 2oFKdnqxwSO8A2LVDdFpkSAM9F+LFv5a1hrHPikuBjIad9WdDIoPNU6qiw== # =9vso # -----END PGP SIGNATURE----- # gpg: Signature made Wed 31 Jul 2024 09:15:10 PM AEST # gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83 # gpg: issuer "pbonzini@redhat.com" # gpg: Good signature from "Paolo Bonzini " [full] # gpg: aka "Paolo Bonzini " [full] * tag 'for-upstream' of https://gitlab.com/bonzini/qemu: qemu-vmsr-helper: implement --verbose/-v qemu-vmsr-helper: fix socket loop breakage target/i386: Clean up error cases for vmsr_read_thread_stat() target/i386: Fix typo that assign same value twice target/i386/cpu: Mask off SGX/SGX_LC feature words for non-PC machine target/i386/cpu: Add dependencies of CPUID 0x12 leaves target/i386/cpu: Explicitly express SGX_LC and SGX feature words dependency target/i386/cpu: Remove unnecessary SGX feature words checks target/i386: Change unavail from u32 to u64 tests/vm/openbsd: Install tomli Signed-off-by: Richard Henderson --- e9d2db818ff934afb366aea566d0b33acf7bced1