X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fpalacios%2Fsvm_lowlevel.S;h=45c55756c73532f9c411f47eff9847302e8d1901;hp=ac11b36d19cf5cee70c7f3c68043405a7933a2e8;hb=660d3c512aa3299ede91a0b2e24d8b5cde6306da;hpb=6ce5a308d167ac392c0f0ca66811f51580358191

diff --git a/palacios/src/palacios/svm_lowlevel.S b/palacios/src/palacios/svm_lowlevel.S
index ac11b36..45c5575 100644
--- a/palacios/src/palacios/svm_lowlevel.S
+++ b/palacios/src/palacios/svm_lowlevel.S
@@ -1,6 +1,5 @@
 #;  -*- fundamental -*-
 
-
 .text
 .align 4
 
@@ -23,6 +22,8 @@
 
 #ifdef __V3_32BIT__
 
+// Note that RAX is saved in the VMCB, so we don't touch it here
+
 #define Save_SVM_Registers(location) 	\
 	pushl	%eax; 			\
 	movl	location, %eax;		\
@@ -33,10 +34,6 @@
 	movl 	%ebx, 32(%eax);		\
 	movl 	%edx, 40(%eax);		\
 	movl 	%ecx, 48(%eax);		\
-	pushl	%ebx;			\
-	movl	8(%esp), %ebx;		\
-	movl	%ebx, 56(%eax);		\
-	popl	%ebx;			\
 	popl 	%eax;			
 	
 
@@ -77,12 +74,15 @@ v3_svm_launch:
 
 	addl	$4, %esp;
 
+	popa;
+	popf;
 
 	movl 	16(%ebp), %eax;
 	vmload;
 
-	popa;
-	popf;
+	// We don't detect failures here, so just return 0
+	xorl	%eax, %eax 
+
 	pop	%ebp;
 	ret
 
@@ -90,6 +90,8 @@ v3_svm_launch:
 
 #elif __V3_64BIT__
 
+// Note that RAX is saved in the VMCB, so we don't touch it here
+
 #define Save_SVM_Registers(location) 	\
 	pushq	%rax; 			\
 	movq	location, %rax;		\
@@ -100,10 +102,6 @@ v3_svm_launch:
 	movq 	%rbx, 32(%rax);		\
 	movq 	%rdx, 40(%rax);		\
 	movq 	%rcx, 48(%rax);		\
-	pushq	%rbx;			\
-	movq	16(%rsp), %rbx;		\
-	movq	%rbx, 56(%rax);		\
-	popq	%rbx;			\
 					\
 	movq	%r8, 64(%rax);		\
 	movq	%r9, 72(%rax);		\