[kvm-unit-tests PATCH v3 03/20] x86/svm: Sort (and swap) GPRs by their index, not alphabetically

[Sean Christopherson <seanjc@google.com>]

Sort all GPRs in the nested SVM infrastructure by their index, not
alphabetically.  This will allow sharing code between SVM and VMX for
context switching GPRs between guest and host.

Signed-off-by: Sean Christopherson <seanjc@google.com>
---
 x86/svm.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/x86/svm.h b/x86/svm.h
index 385c1289..d9f7c731 100644
--- a/x86/svm.h
+++ b/x86/svm.h
@@ -392,9 +392,9 @@ struct svm_test {
 
 struct regs {
 	u64 rax;
-	u64 rbx;
 	u64 rcx;
 	u64 rdx;
+	u64 rbx;
 	u64 cr2;
 	u64 rbp;
 	u64 rsi;
@@ -457,9 +457,9 @@ static inline void clgi(void)
 
 
 #define SAVE_GPR_C                              \
-        "xchg %%rbx, regs+0x8\n\t"              \
-        "xchg %%rcx, regs+0x10\n\t"             \
-        "xchg %%rdx, regs+0x18\n\t"             \
+        "xchg %%rcx, regs+0x8\n\t"              \
+        "xchg %%rdx, regs+0x10\n\t"             \
+        "xchg %%rbx, regs+0x18\n\t"             \
         "xchg %%rbp, regs+0x28\n\t"             \
         "xchg %%rsi, regs+0x30\n\t"             \
         "xchg %%rdi, regs+0x38\n\t"             \
-- 
2.54.0.563.g4f69b47b94-goog