[PATCH v3 01/49] Revert "linux-headers hack" from sevinit2 base tree

[Michael Roth <michael.roth@amd.com>]

TODO: Either apply this in advance of sevinit2 patches, or drop this in
favor of a separate preceeding sync of 6.8 kvm-next.

A separate standalone linux-headers sync will be used instead.

Signed-off-by: Michael Roth <michael.roth@amd.com>
---
 linux-headers/asm-x86/kvm.h | 8 --------
 linux-headers/linux/kvm.h   | 2 --
 2 files changed, 10 deletions(-)

diff --git a/linux-headers/asm-x86/kvm.h b/linux-headers/asm-x86/kvm.h
index 8f58c32d37..003fb74534 100644
--- a/linux-headers/asm-x86/kvm.h
+++ b/linux-headers/asm-x86/kvm.h
@@ -562,13 +562,5 @@ struct kvm_pmu_event_filter {
 
 #define KVM_X86_DEFAULT_VM	0
 #define KVM_X86_SW_PROTECTED_VM	1
-#define KVM_X86_SEV_VM          2
-#define KVM_X86_SEV_ES_VM       3
-
-struct kvm_sev_init {
-        __u64 vmsa_features;
-        __u32 flags;
-        __u32 pad[9];
-};
 
 #endif /* _ASM_X86_KVM_H */
diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h
index 5fd84fd7d0..17839229b2 100644
--- a/linux-headers/linux/kvm.h
+++ b/linux-headers/linux/kvm.h
@@ -1865,8 +1865,6 @@ enum sev_cmd_id {
 	/* Guest Migration Extension */
 	KVM_SEV_SEND_CANCEL,
 
-	KVM_SEV_INIT2,
-
 	KVM_SEV_NR_MAX,
 };
 
-- 
2.25.1