Commit 3c75e6a5 authored Feb 13, 2026 by Sean Christopherson

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>

parent 4059172b

arch/x86/include/asm/vmx.h

+11 −0

Original line number	Diff line number	Diff line
		@@ -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)

		/*

arch/x86/kvm/vmx/vmcs.h

+0 −11

Original line number	Diff line number	Diff line
		@@ -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);

		/*