|
@@ -3651,11 +3651,16 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
|
|
|
"mov %%"R"sp, %c[host_rsp](%0) \n\t"
|
|
|
__ex(ASM_VMX_VMWRITE_RSP_RDX) "\n\t"
|
|
|
"1: \n\t"
|
|
|
+ /* Reload cr2 if changed */
|
|
|
+ "mov %c[cr2](%0), %%"R"ax \n\t"
|
|
|
+ "mov %%cr2, %%"R"dx \n\t"
|
|
|
+ "cmp %%"R"ax, %%"R"dx \n\t"
|
|
|
+ "je 2f \n\t"
|
|
|
+ "mov %%"R"ax, %%cr2 \n\t"
|
|
|
+ "2: \n\t"
|
|
|
/* Check if vmlaunch of vmresume is needed */
|
|
|
"cmpl $0, %c[launched](%0) \n\t"
|
|
|
/* Load guest registers. Don't clobber flags. */
|
|
|
- "mov %c[cr2](%0), %%"R"ax \n\t"
|
|
|
- "mov %%"R"ax, %%cr2 \n\t"
|
|
|
"mov %c[rax](%0), %%"R"ax \n\t"
|
|
|
"mov %c[rbx](%0), %%"R"bx \n\t"
|
|
|
"mov %c[rdx](%0), %%"R"dx \n\t"
|