aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/kvm/kvm-ia64.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ia64/kvm/kvm-ia64.c')
-rw-r--r--arch/ia64/kvm/kvm-ia64.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index ca1cfb124d4f..f7589dba75ab 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -340,7 +340,7 @@ static int handle_ipi(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
340 regs->cr_iip = vcpu->kvm->arch.rdv_sal_data.boot_ip; 340 regs->cr_iip = vcpu->kvm->arch.rdv_sal_data.boot_ip;
341 regs->r1 = vcpu->kvm->arch.rdv_sal_data.boot_gp; 341 regs->r1 = vcpu->kvm->arch.rdv_sal_data.boot_gp;
342 342
343 target_vcpu->arch.mp_state = VCPU_MP_STATE_RUNNABLE; 343 target_vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE;
344 if (waitqueue_active(&target_vcpu->wq)) 344 if (waitqueue_active(&target_vcpu->wq))
345 wake_up_interruptible(&target_vcpu->wq); 345 wake_up_interruptible(&target_vcpu->wq);
346 } else { 346 } else {
@@ -386,7 +386,7 @@ static int handle_global_purge(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
386 386
387 for (i = 0; i < KVM_MAX_VCPUS; i++) { 387 for (i = 0; i < KVM_MAX_VCPUS; i++) {
388 if (!kvm->vcpus[i] || kvm->vcpus[i]->arch.mp_state == 388 if (!kvm->vcpus[i] || kvm->vcpus[i]->arch.mp_state ==
389 VCPU_MP_STATE_UNINITIALIZED || 389 KVM_MP_STATE_UNINITIALIZED ||
390 vcpu == kvm->vcpus[i]) 390 vcpu == kvm->vcpus[i])
391 continue; 391 continue;
392 392
@@ -437,12 +437,12 @@ int kvm_emulate_halt(struct kvm_vcpu *vcpu)
437 hrtimer_start(p_ht, kt, HRTIMER_MODE_ABS); 437 hrtimer_start(p_ht, kt, HRTIMER_MODE_ABS);
438 438
439 if (irqchip_in_kernel(vcpu->kvm)) { 439 if (irqchip_in_kernel(vcpu->kvm)) {
440 vcpu->arch.mp_state = VCPU_MP_STATE_HALTED; 440 vcpu->arch.mp_state = KVM_MP_STATE_HALTED;
441 kvm_vcpu_block(vcpu); 441 kvm_vcpu_block(vcpu);
442 hrtimer_cancel(p_ht); 442 hrtimer_cancel(p_ht);
443 vcpu->arch.ht_active = 0; 443 vcpu->arch.ht_active = 0;
444 444
445 if (vcpu->arch.mp_state != VCPU_MP_STATE_RUNNABLE) 445 if (vcpu->arch.mp_state != KVM_MP_STATE_RUNNABLE)
446 return -EINTR; 446 return -EINTR;
447 return 1; 447 return 1;
448 } else { 448 } else {
@@ -668,7 +668,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
668 668
669 vcpu_load(vcpu); 669 vcpu_load(vcpu);
670 670
671 if (unlikely(vcpu->arch.mp_state == VCPU_MP_STATE_UNINITIALIZED)) { 671 if (unlikely(vcpu->arch.mp_state == KVM_MP_STATE_UNINITIALIZED)) {
672 kvm_vcpu_block(vcpu); 672 kvm_vcpu_block(vcpu);
673 vcpu_put(vcpu); 673 vcpu_put(vcpu);
674 return -EAGAIN; 674 return -EAGAIN;
@@ -1127,12 +1127,12 @@ static enum hrtimer_restart hlt_timer_fn(struct hrtimer *data)
1127 wait_queue_head_t *q; 1127 wait_queue_head_t *q;
1128 1128
1129 vcpu = container_of(data, struct kvm_vcpu, arch.hlt_timer); 1129 vcpu = container_of(data, struct kvm_vcpu, arch.hlt_timer);
1130 if (vcpu->arch.mp_state != VCPU_MP_STATE_HALTED) 1130 if (vcpu->arch.mp_state != KVM_MP_STATE_HALTED)
1131 goto out; 1131 goto out;
1132 1132
1133 q = &vcpu->wq; 1133 q = &vcpu->wq;
1134 if (waitqueue_active(q)) { 1134 if (waitqueue_active(q)) {
1135 vcpu->arch.mp_state = VCPU_MP_STATE_RUNNABLE; 1135 vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE;
1136 wake_up_interruptible(q); 1136 wake_up_interruptible(q);
1137 } 1137 }
1138out: 1138out:
@@ -1159,7 +1159,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
1159 return PTR_ERR(vmm_vcpu); 1159 return PTR_ERR(vmm_vcpu);
1160 1160
1161 if (vcpu->vcpu_id == 0) { 1161 if (vcpu->vcpu_id == 0) {
1162 vcpu->arch.mp_state = VCPU_MP_STATE_RUNNABLE; 1162 vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE;
1163 1163
1164 /*Set entry address for first run.*/ 1164 /*Set entry address for first run.*/
1165 regs->cr_iip = PALE_RESET_ENTRY; 1165 regs->cr_iip = PALE_RESET_ENTRY;
@@ -1172,7 +1172,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
1172 v->arch.last_itc = 0; 1172 v->arch.last_itc = 0;
1173 } 1173 }
1174 } else 1174 } else
1175 vcpu->arch.mp_state = VCPU_MP_STATE_UNINITIALIZED; 1175 vcpu->arch.mp_state = KVM_MP_STATE_UNINITIALIZED;
1176 1176
1177 r = -ENOMEM; 1177 r = -ENOMEM;
1178 vcpu->arch.apic = kzalloc(sizeof(struct kvm_lapic), GFP_KERNEL); 1178 vcpu->arch.apic = kzalloc(sizeof(struct kvm_lapic), GFP_KERNEL);
@@ -1704,10 +1704,10 @@ int kvm_apic_set_irq(struct kvm_vcpu *vcpu, u8 vec, u8 trig)
1704 1704
1705 if (!test_and_set_bit(vec, &vpd->irr[0])) { 1705 if (!test_and_set_bit(vec, &vpd->irr[0])) {
1706 vcpu->arch.irq_new_pending = 1; 1706 vcpu->arch.irq_new_pending = 1;
1707 if (vcpu->arch.mp_state == VCPU_MP_STATE_RUNNABLE) 1707 if (vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE)
1708 kvm_vcpu_kick(vcpu); 1708 kvm_vcpu_kick(vcpu);
1709 else if (vcpu->arch.mp_state == VCPU_MP_STATE_HALTED) { 1709 else if (vcpu->arch.mp_state == KVM_MP_STATE_HALTED) {
1710 vcpu->arch.mp_state = VCPU_MP_STATE_RUNNABLE; 1710 vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE;
1711 if (waitqueue_active(&vcpu->wq)) 1711 if (waitqueue_active(&vcpu->wq))
1712 wake_up_interruptible(&vcpu->wq); 1712 wake_up_interruptible(&vcpu->wq);
1713 } 1713 }
@@ -1790,5 +1790,5 @@ gfn_t unalias_gfn(struct kvm *kvm, gfn_t gfn)
1790 1790
1791int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu) 1791int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu)
1792{ 1792{
1793 return vcpu->arch.mp_state == VCPU_MP_STATE_RUNNABLE; 1793 return vcpu->arch.mp_state == KVM_MP_STATE_RUNNABLE;
1794} 1794}