Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9ae0448f53324b3c476f68bd134d97ac4ec27e0c
Commit:     9ae0448f53324b3c476f68bd134d97ac4ec27e0c
Parent:     310bc76c2b6829cd280def4927b7ccf8b8c795df
Author:     Shaohua Li <[EMAIL PROTECTED]>
AuthorDate: Mon Jul 23 14:51:32 2007 +0800
Committer:  Avi Kivity <[EMAIL PROTECTED]>
CommitDate: Sat Oct 13 10:18:19 2007 +0200

    KVM: Hoist kvm_mmu_reload() out of the critical section
    
    vmx_cpu_run doesn't handle error correctly and kvm_mmu_reload might
    sleep with mutex changes, so I move it above.
    
    Signed-off-by: Shaohua Li <[EMAIL PROTECTED]>
    Signed-off-by: Avi Kivity <[EMAIL PROTECTED]>
---
 drivers/kvm/vmx.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/kvm/vmx.c b/drivers/kvm/vmx.c
index 2c4f01b..79674a7 100644
--- a/drivers/kvm/vmx.c
+++ b/drivers/kvm/vmx.c
@@ -1999,16 +1999,16 @@ preempted:
                kvm_guest_debug_pre(vcpu);
 
 again:
+       r = kvm_mmu_reload(vcpu);
+       if (unlikely(r))
+               goto out;
+
        if (!vcpu->mmio_read_completed)
                do_interrupt_requests(vcpu, kvm_run);
 
        vmx_save_host_state(vcpu);
        kvm_load_guest_fpu(vcpu);
 
-       r = kvm_mmu_reload(vcpu);
-       if (unlikely(r))
-               goto out;
-
        /*
         * Loading guest fpu may have cleared host cr0.ts
         */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to