From feb7bf5b96c1facebabdf01219fae259ccf633ba Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Wed, 7 Nov 2007 17:14:18 +0200 Subject: [PATCH] --- yaml --- r: 73560 b: refs/heads/master c: 56ba47ddbd5af7918bf1acdbe3deb979d0dcd64b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/kvm/svm.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0dc2724a5484..26c36ae50074 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 70433389ccfe2719ef5cd539d04172260294f0f5 +refs/heads/master: 56ba47ddbd5af7918bf1acdbe3deb979d0dcd64b diff --git a/trunk/drivers/kvm/svm.c b/trunk/drivers/kvm/svm.c index 3910358db79d..7376805c88ab 100644 --- a/trunk/drivers/kvm/svm.c +++ b/trunk/drivers/kvm/svm.c @@ -1585,10 +1585,6 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) #endif : "cc", "memory" ); - local_irq_disable(); - - stgi(); - if ((svm->vmcb->save.dr7 & 0xff)) load_db_regs(svm->host_db_regs); @@ -1605,6 +1601,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) reload_tss(vcpu); + local_irq_disable(); + + stgi(); + svm->next_rip = 0; }