diff options
| author | Sean Christopherson <seanjc@google.com> | 2026-02-14 04:26:48 +0300 |
|---|---|---|
| committer | Sean Christopherson <seanjc@google.com> | 2026-03-04 19:52:26 +0300 |
| commit | 3c75e6a5da3c0dfcd34e5f9df5390804179f2aeb (patch) | |
| tree | ddf3139afe32925940442ffb3e1b80937a238ad8 | |
| parent | 4059172b2a78a71d15d8fcd8d3fd8ea1ba65d25b (diff) | |
| download | linux-3c75e6a5da3c0dfcd34e5f9df5390804179f2aeb.tar.xz | |
KVM: VMX: Move architectural "vmcs" and "vmcs_hdr" structures to public vmx.h
Move "struct vmcs" and "struct vmcs_hdr" to asm/vmx.h in anticipation of
moving VMXON/VMXOFF to the core kernel (VMXON requires a "root" VMCS with
the appropriate revision ID in its header).
No functional change intended.
Tested-by: Chao Gao <chao.gao@intel.com>
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Tested-by: Sagi Shahar <sagis@google.com>
Link: https://patch.msgid.link/20260214012702.2368778-3-seanjc@google.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
| -rw-r--r-- | arch/x86/include/asm/vmx.h | 11 | ||||
| -rw-r--r-- | arch/x86/kvm/vmx/vmcs.h | 11 |
2 files changed, 11 insertions, 11 deletions
diff --git a/arch/x86/include/asm/vmx.h b/arch/x86/include/asm/vmx.h index b92ff87e3560..37080382df54 100644 --- a/arch/x86/include/asm/vmx.h +++ b/arch/x86/include/asm/vmx.h @@ -20,6 +20,17 @@ #include <asm/trapnr.h> #include <asm/vmxfeatures.h> +struct vmcs_hdr { + u32 revision_id:31; + u32 shadow_vmcs:1; +}; + +struct vmcs { + struct vmcs_hdr hdr; + u32 abort; + char data[]; +}; + #define VMCS_CONTROL_BIT(x) BIT(VMX_FEATURE_##x & 0x1f) /* diff --git a/arch/x86/kvm/vmx/vmcs.h b/arch/x86/kvm/vmx/vmcs.h index 66d747e265b1..1f16ddeae9cb 100644 --- a/arch/x86/kvm/vmx/vmcs.h +++ b/arch/x86/kvm/vmx/vmcs.h @@ -22,17 +22,6 @@ #define VMCS12_IDX_TO_ENC(idx) ROL16(idx, 10) #define ENC_TO_VMCS12_IDX(enc) ROL16(enc, 6) -struct vmcs_hdr { - u32 revision_id:31; - u32 shadow_vmcs:1; -}; - -struct vmcs { - struct vmcs_hdr hdr; - u32 abort; - char data[]; -}; - DECLARE_PER_CPU(struct vmcs *, current_vmcs); /* |