The following changes since commit 31ebff513fad11f315377f6b07447169be8d9f86:
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2021-09-03' into staging (2021-09-04 19:21:19 +0100) are available in the Git repository at: https://gitlab.com/bonzini/qemu.git tags/for-upstream for you to fetch changes up to 4e3cdb6ce6048bb28d70a438081252a29563b757: doc: Add the SGX doc (2021-09-06 04:10:24 -0400) ---------------------------------------------------------------- * SGX support (Sean, Yang) * vGIF and vVMLOAD/VMSAVE support (Lara) * Move GBM handling to Meson (Thomas) ---------------------------------------------------------------- Lara Lazier (7): target/i386: VMRUN and VMLOAD canonicalizations target/i386: Added VGIF feature target/i386: Moved int_ctl into CPUX86State structure target/i386: Added VGIF V_IRQ masking capability target/i386: Added ignore TPR check in ctl_has_irq target/i386: Added changed priority check for VIRQ target/i386: Added vVMLOAD and vVMSAVE feature Sean Christopherson (21): memory: Add RAM_PROTECTED flag to skip IOMMU mappings hostmem: Add hostmem-epc as a backend for SGX EPC i386: Add 'sgx-epc' device to expose EPC sections to guest vl: Add sgx compound properties to expose SGX EPC sections to guest i386: Add primary SGX CPUID and MSR defines i386: Add SGX CPUID leaf FEAT_SGX_12_0_EAX i386: Add SGX CPUID leaf FEAT_SGX_12_0_EBX i386: Add SGX CPUID leaf FEAT_SGX_12_1_EAX i386: Add get/set/migrate support for SGX_LEPUBKEYHASH MSRs i386: Add feature control MSR dependency when SGX is enabled i386: Update SGX CPUID info according to hardware/KVM/user input i386: kvm: Add support for exposing PROVISIONKEY to guest i386: Propagate SGX CPUID sub-leafs to KVM Adjust min CPUID level to 0x12 when SGX is enabled hw/i386/fw_cfg: Set SGX bits in feature control fw_cfg accordingly hw/i386/pc: Account for SGX EPC sections when calculating device memory i386/pc: Add e820 entry for SGX EPC section(s) i386: acpi: Add SGX EPC entry to ACPI tables q35: Add support for SGX EPC i440fx: Add support for SGX EPC doc: Add the SGX doc Thomas Huth (1): configure / meson: Move the GBM handling to meson.build Yang Zhong (7): qom: Add memory-backend-epc ObjectOptions support hostmem-epc: Add the reset interface for EPC backend reset sgx-epc: Add the reset interface for sgx-epc virt device sgx-epc: Avoid bios reset during sgx epc initialization hostmem-epc: Make prealloc consistent with qemu cmdline during reset Kconfig: Add CONFIG_SGX support sgx-epc: Add the fill_device_info() callback support backends/hostmem-epc.c | 118 ++++++++++++++ backends/meson.build | 1 + configs/devices/i386-softmmu/default.mak | 1 + configure | 14 -- contrib/vhost-user-gpu/meson.build | 5 +- docs/intel-sgx.txt | 167 +++++++++++++++++++ hw/i386/Kconfig | 5 + hw/i386/acpi-build.c | 22 +++ hw/i386/fw_cfg.c | 10 +- hw/i386/meson.build | 2 + hw/i386/pc.c | 15 +- hw/i386/pc_piix.c | 4 + hw/i386/pc_q35.c | 3 + hw/i386/sgx-epc.c | 265 +++++++++++++++++++++++++++++++ hw/i386/sgx-stub.c | 13 ++ hw/i386/sgx.c | 84 ++++++++++ hw/i386/x86.c | 29 ++++ hw/vfio/common.c | 1 + include/exec/memory.h | 15 +- include/hw/i386/pc.h | 8 + include/hw/i386/sgx-epc.h | 67 ++++++++ include/hw/i386/x86.h | 1 + meson.build | 14 +- monitor/hmp-cmds.c | 10 ++ qapi/machine.json | 52 +++++- qapi/qom.json | 19 +++ qemu-options.hx | 10 +- slirp | 2 +- softmmu/memory.c | 5 + softmmu/physmem.c | 3 +- target/i386/cpu.c | 199 +++++++++++++++++++++-- target/i386/cpu.h | 38 +++++ target/i386/kvm/kvm.c | 75 +++++++++ target/i386/kvm/kvm_i386.h | 2 + target/i386/machine.c | 42 ++++- target/i386/svm.h | 8 + target/i386/tcg/seg_helper.c | 2 +- target/i386/tcg/sysemu/excp_helper.c | 2 +- target/i386/tcg/sysemu/misc_helper.c | 11 +- target/i386/tcg/sysemu/svm_helper.c | 121 +++++++++----- 40 files changed, 1377 insertions(+), 88 deletions(-) create mode 100644 backends/hostmem-epc.c create mode 100644 docs/intel-sgx.txt create mode 100644 hw/i386/sgx-epc.c create mode 100644 hw/i386/sgx-stub.c create mode 100644 hw/i386/sgx.c create mode 100644 include/hw/i386/sgx-epc.h -- 2.31.1