From e275df7a535f2840511d68307b0c3b650cf912c2 Mon Sep 17 00:00:00 2001 From: Shaohua Li Date: Mon, 23 Jul 2007 14:51:32 +0800 Subject: [PATCH] --- yaml --- r: 68356 b: refs/heads/master c: 9ae0448f53324b3c476f68bd134d97ac4ec27e0c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/kvm/vmx.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 6881659382f3..b661bb7f09c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 310bc76c2b6829cd280def4927b7ccf8b8c795df +refs/heads/master: 9ae0448f53324b3c476f68bd134d97ac4ec27e0c diff --git a/trunk/drivers/kvm/vmx.c b/trunk/drivers/kvm/vmx.c index 2c4f01bea1fb..79674a7a92bb 100644 --- a/trunk/drivers/kvm/vmx.c +++ b/trunk/drivers/kvm/vmx.c @@ -1999,16 +1999,16 @@ static int vmx_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) 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 */