1 files changed, 16 insertions, 40 deletions

diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index 21b701374f72..f56a6316e134 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -725,8 +725,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
         int r;
         sigset_t sigsaved;
 
-        vcpu_load(vcpu);
-
         if (vcpu->sigset_active)
                 sigprocmask(SIG_SETMASK, &vcpu->sigset, &sigsaved);
 
@@ -748,7 +746,6 @@ out:
         if (vcpu->sigset_active)
                 sigprocmask(SIG_SETMASK, &sigsaved, NULL);
 
-        vcpu_put(vcpu);
         return r;
 }
 
@@ -883,8 +880,6 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)
         struct vpd *vpd = to_host(vcpu->kvm, vcpu->arch.vpd);
         int i;
 
-        vcpu_load(vcpu);
-
         for (i = 0; i < 16; i++) {
                 vpd->vgr[i] = regs->vpd.vgr[i];
                 vpd->vbgr[i] = regs->vpd.vbgr[i];
@@ -931,8 +926,6 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)
         vcpu->arch.itc_offset = regs->saved_itc - kvm_get_itc(vcpu);
         set_bit(KVM_REQ_RESUME, &vcpu->requests);
 
-        vcpu_put(vcpu);
-
         return 0;
 }
 
@@ -1237,7 +1230,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
         p_ctx->cr[2] = (unsigned long)kvm_vmm_info->vmm_ivt;
         p_ctx->cr[8] = 0x3c;
 
-        /*Initilize region register*/
+        /*Initialize region register*/
         p_ctx->rr[0] = 0x30;
         p_ctx->rr[1] = 0x30;
         p_ctx->rr[2] = 0x30;
@@ -1246,7 +1239,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
         p_ctx->rr[5] = 0x30;
         p_ctx->rr[7] = 0x30;
 
-        /*Initilize branch register 0*/
+        /*Initialize branch register 0*/
         p_ctx->br[0] = *(unsigned long *)kvm_vmm_info->vmm_entry;
 
         vcpu->arch.vmm_rr = kvm->arch.vmm_init_rr;
@@ -1707,7 +1700,7 @@ static int kvm_relocate_vmm(struct kvm_vmm_info *vmm_info,
         BUG_ON(!module);
 
         if (!kvm_vmm_base) {
-                printk("kvm: kvm area hasn't been initilized yet!!\n");
+                printk("kvm: kvm area hasn't been initialized yet!!\n");
                 return -EFAULT;
         }
 
@@ -1802,35 +1795,24 @@ void kvm_arch_exit(void)
         kvm_vmm_info = NULL;
 }
 
-static int kvm_ia64_sync_dirty_log(struct kvm *kvm,
-                struct kvm_dirty_log *log)
+static void kvm_ia64_sync_dirty_log(struct kvm *kvm,
+                                    struct kvm_memory_slot *memslot)
 {
-        struct kvm_memory_slot *memslot;
-        int r, i;
+        int i;
         long base;
         unsigned long n;
         unsigned long *dirty_bitmap = (unsigned long *)(kvm->arch.vm_base +
                         offsetof(struct kvm_vm_data, kvm_mem_dirty_log));
 
-        r = -EINVAL;
-        if (log->slot >= KVM_MEMORY_SLOTS)
-                goto out;
-
-        memslot = &kvm->memslots->memslots[log->slot];
-        r = -ENOENT;
-        if (!memslot->dirty_bitmap)
-                goto out;
-
         n = kvm_dirty_bitmap_bytes(memslot);
         base = memslot->base_gfn / BITS_PER_LONG;
 
+        spin_lock(&kvm->arch.dirty_log_lock);
         for (i = 0; i < n/sizeof(long); ++i) {
                 memslot->dirty_bitmap[i] = dirty_bitmap[base + i];
                 dirty_bitmap[base + i] = 0;
         }
-        r = 0;
-out:
-        return r;
+        spin_unlock(&kvm->arch.dirty_log_lock);
 }
 
 int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm,
@@ -1842,12 +1824,17 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm,
         int is_dirty = 0;
 
         mutex_lock(&kvm->slots_lock);
-        spin_lock(&kvm->arch.dirty_log_lock);
 
-        r = kvm_ia64_sync_dirty_log(kvm, log);
-        if (r)
+        r = -EINVAL;
+        if (log->slot >= KVM_MEMORY_SLOTS)
+                goto out;
+
+        memslot = &kvm->memslots->memslots[log->slot];
+        r = -ENOENT;
+        if (!memslot->dirty_bitmap)
                 goto out;
 
+        kvm_ia64_sync_dirty_log(kvm, memslot);
         r = kvm_get_dirty_log(kvm, log, &is_dirty);
         if (r)
                 goto out;
@@ -1855,14 +1842,12 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm,
         /* If nothing is dirty, don't bother messing with page tables. */
         if (is_dirty) {
                 kvm_flush_remote_tlbs(kvm);
-                memslot = &kvm->memslots->memslots[log->slot];
                 n = kvm_dirty_bitmap_bytes(memslot);
                 memset(memslot->dirty_bitmap, 0, n);
         }
         r = 0;
 out:
         mutex_unlock(&kvm->slots_lock);
-        spin_unlock(&kvm->arch.dirty_log_lock);
         return r;
 }
 
@@ -1953,11 +1938,6 @@ int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu)
         return vcpu->arch.timer_fired;
 }
 
-gfn_t unalias_gfn(struct kvm *kvm, gfn_t gfn)
-{
-        return gfn;
-}
-
 int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu)
 {
         return (vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE) ||
@@ -1967,9 +1947,7 @@ int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu)
 int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu,
                                     struct kvm_mp_state *mp_state)
 {
-        vcpu_load(vcpu);
         mp_state->mp_state = vcpu->arch.mp_state;
-        vcpu_put(vcpu);
         return 0;
 }
 
@@ -2000,10 +1978,8 @@ int kvm_arch_vcpu_ioctl_set_mpstate(struct kvm_vcpu *vcpu,
 {
         int r = 0;
 
-        vcpu_load(vcpu);
         vcpu->arch.mp_state = mp_state->mp_state;
         if (vcpu->arch.mp_state == KVM_MP_STATE_UNINITIALIZED)
                 r = vcpu_reset(vcpu);
-        vcpu_put(vcpu);
         return r;
 }