The following changes since commit ee26ce674a93c824713542cec3b6a9ca85459165:
Merge remote-tracking branch 'remotes/jsnow/tags/python-pull-request' into staging (2021-10-12 16:08:33 -0700) are available in the Git repository at: https://gitlab.com/bonzini/qemu.git tags/for-upstream for you to fetch changes up to eeecc2ede44b2a5f2551dfcebd561a3945d4c132: ebpf: really include it only in system emulators (2021-10-13 10:47:50 +0200) ---------------------------------------------------------------- * SEV and SGX cleanups (Philippe, Dov) * bugfixes for "check-block" * bugfix for static build * ObjectOptions cleanups (Thomas) * binutils fix for PVH (Cole) * HVF cleanup (Alex) ---------------------------------------------------------------- Alexander Graf (1): hvf: Determine slot count from struct layout Cole Robinson (1): tests: tcg: Fix PVH test with binutils 2.36+ Dov Murik (2): target/i386/sev: Use local variable for kvm_sev_launch_start target/i386/sev: Use local variable for kvm_sev_launch_measure Dr. David Alan Gilbert (1): target/i386/sev: sev_get_attestation_report use g_autofree Kacper Słomiński (1): util/compatfd.c: use libc signalfd wrapper instead of raw syscall Markus Armbruster (1): monitor: Tidy up find_device_state() Paolo Bonzini (5): tests: add missing dependency for check-block build: fix "make check" without earlier "make" qemu-iotests: flush after every test Revert "hw/misc: applesmc: use host osk as default on macs" ebpf: really include it only in system emulators Philippe Mathieu-Daudé (27): MAINTAINERS: Add myself as reviewer of the 'Memory API' qapi/misc-target: Wrap long 'SEV Attestation Report' long lines qapi/misc-target: Group SEV QAPI definitions target/i386/kvm: Introduce i386_softmmu_kvm Meson source set target/i386/kvm: Restrict SEV stubs to x86 architecture target/i386/sev: Prefix QMP errors with 'SEV' target/i386/monitor: Return QMP error when SEV is not enabled for guest target/i386/cpu: Add missing 'qapi/error.h' header target/i386/sev_i386.h: Remove unused headers target/i386/sev: Remove sev_get_me_mask() target/i386/sev: Mark unreachable code with g_assert_not_reached() target/i386/sev: Use g_autofree in sev_launch_get_measure() target/i386/sev: Restrict SEV to system emulation target/i386/sev: Rename sev_i386.h -> sev.h target/i386/sev: Declare system-specific functions in 'sev.h' target/i386/sev: Remove stubs by using code elision target/i386/sev: Move qmp_query_sev_attestation_report() to sev.c target/i386/sev: Move qmp_sev_inject_launch_secret() to sev.c target/i386/sev: Move qmp_query_sev_capabilities() to sev.c target/i386/sev: Move qmp_query_sev_launch_measure() to sev.c target/i386/sev: Move qmp_query_sev() & hmp_info_sev() to sev.c monitor: Reduce hmp_info_sev() declaration MAINTAINERS: Cover SEV-related files with X86/KVM section MAINTAINERS: Cover SGX documentation file with X86/KVM section hw/i386/sgx: Have sgx_epc_get_section() return a boolean hw/i386/sgx: Move qmp_query_sgx_capabilities() to hw/i386/sgx.c hw/i386/sgx: Move qmp_query_sgx() and hmp_info_sgx() to hw/i386/sgx.c Thomas Huth (1): qapi: Make some ObjectTypes depend on the build settings MAINTAINERS | 4 + accel/hvf/hvf-accel-ops.c | 2 +- accel/kvm/meson.build | 1 - hw/i386/pc_sysfw.c | 2 +- hw/i386/sgx-stub.c | 16 ++- hw/i386/sgx.c | 35 +++++- hw/i386/x86.c | 2 +- hw/misc/applesmc.c | 192 +------------------------------- include/hw/i386/sgx-epc.h | 2 +- include/hw/i386/sgx.h | 12 -- include/monitor/hmp-target.h | 1 + include/monitor/hmp.h | 1 - include/sysemu/sev.h | 28 ----- meson.build | 9 +- qapi/misc-target.json | 77 ++++++------- qapi/qom.json | 36 ++++-- softmmu/qdev-monitor.c | 13 +-- target/i386/cpu.c | 16 +-- target/i386/kvm/kvm.c | 3 +- target/i386/kvm/meson.build | 8 +- {accel => target/i386}/kvm/sev-stub.c | 2 +- target/i386/meson.build | 4 +- target/i386/monitor.c | 124 +-------------------- target/i386/sev-stub.c | 88 --------------- target/i386/sev-sysemu-stub.c | 70 ++++++++++++ target/i386/sev.c | 201 +++++++++++++++++++++++----------- target/i386/{sev_i386.h => sev.h} | 35 +++--- tests/Makefile.include | 16 ++- tests/qemu-iotests/testrunner.py | 1 + tests/tcg/x86_64/system/kernel.ld | 5 +- util/compatfd.c | 5 +- 31 files changed, 392 insertions(+), 619 deletions(-) delete mode 100644 include/hw/i386/sgx.h delete mode 100644 include/sysemu/sev.h rename {accel => target/i386}/kvm/sev-stub.c (94%) delete mode 100644 target/i386/sev-stub.c create mode 100644 target/i386/sev-sysemu-stub.c rename target/i386/{sev_i386.h => sev.h} (62%) -- 2.31.1
