diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2024-08-01 07:31:49 +1000 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2024-08-01 07:31:49 +1000 |
| commit | e9d2db818ff934afb366aea566d0b33acf7bced1 (patch) | |
| tree | f770f5f28f3ce3d39617693af8b9286b2dfd9776 /hw | |
| parent | 4e56e89d6c81589cc47cf5811f570c67889bd18a (diff) | |
| parent | 2a99c2ba822ef9758d739ffdefbe6252520c1719 (diff) | |
| download | qemu-e9d2db818ff934afb366aea566d0b33acf7bced1.zip qemu-e9d2db818ff934afb366aea566d0b33acf7bced1.tar.gz qemu-e9d2db818ff934afb366aea566d0b33acf7bced1.tar.bz2 | |
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 <bonzini@gnu.org>" [full]
# gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [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 <richard.henderson@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/i386/sgx-stub.c | 5 | ||||
| -rw-r--r-- | hw/i386/sgx.c | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/hw/i386/sgx-stub.c b/hw/i386/sgx-stub.c index 16b1dfd..38ff75e 100644 --- a/hw/i386/sgx-stub.c +++ b/hw/i386/sgx-stub.c @@ -32,6 +32,11 @@ void pc_machine_init_sgx_epc(PCMachineState *pcms) memset(&pcms->sgx_epc, 0, sizeof(SGXEPCState)); } +bool check_sgx_support(void) +{ + return false; +} + bool sgx_epc_get_section(int section_nr, uint64_t *addr, uint64_t *size) { return true; diff --git a/hw/i386/sgx.c b/hw/i386/sgx.c index 849472a..4900dd4 100644 --- a/hw/i386/sgx.c +++ b/hw/i386/sgx.c @@ -266,6 +266,14 @@ void hmp_info_sgx(Monitor *mon, const QDict *qdict) size); } +bool check_sgx_support(void) +{ + if (!object_dynamic_cast(qdev_get_machine(), TYPE_PC_MACHINE)) { + return false; + } + return true; +} + bool sgx_epc_get_section(int section_nr, uint64_t *addr, uint64_t *size) { PCMachineState *pcms = |