[PATCH] KVM: SVM: Fix reserved fields of struct sev_es_save_area

From: Carlos Bilbao
Date: Tue Oct 04 2022 - 10:05:42 EST


Reserved fields of struct sev_es_save_area are named by their order of
appearance, but right now they jump from reserved_5 to reserved_7. Rename
them with the correct order.

Fixes: 6d3b3d34e39eb ("KVM: SVM: Update the SEV-ES save area mapping")

Signed-off-by: Carlos Bilbao <carlos.bilbao@xxxxxxx>
---
 arch/x86/include/asm/svm.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/x86/include/asm/svm.h b/arch/x86/include/asm/svm.h
index 0361626841bc..6ab45a0389dc 100644
--- a/arch/x86/include/asm/svm.h
+++ b/arch/x86/include/asm/svm.h
@@ -393,14 +393,14 @@ struct sev_es_save_area {
     u64 br_to;
     u64 last_excp_from;
     u64 last_excp_to;
-    u8 reserved_7[80];
+    u8 reserved_6[80];
     u32 pkru;
-    u8 reserved_8[20];
-    u64 reserved_9;        /* rax already available at 0x01f8 */
+    u8 reserved_7[20];
+    u64 reserved_8;        /* rax already available at 0x01f8 */
     u64 rcx;
     u64 rdx;
     u64 rbx;
-    u64 reserved_10;    /* rsp already available at 0x01d8 */
+    u64 reserved_9;    /* rsp already available at 0x01d8 */
     u64 rbp;
     u64 rsi;
     u64 rdi;
@@ -412,7 +412,7 @@ struct sev_es_save_area {
     u64 r13;
     u64 r14;
     u64 r15;
-    u8 reserved_11[16];
+    u8 reserved_10[16];
     u64 guest_exit_info_1;
     u64 guest_exit_info_2;
     u64 guest_exit_int_info;
@@ -425,7 +425,7 @@ struct sev_es_save_area {
     u64 pcpu_id;
     u64 event_inj;
     u64 xcr0;
-    u8 reserved_12[16];
+    u8 reserved_11[16];

     /* Floating point area */
     u64 x87_dp;
--
2.37.0 (Apple Git-136)