1 files changed, 10 insertions, 20 deletions

diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index 463fb3bbe11e..bd77cb507c1c 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -232,12 +232,12 @@ static int handle_mmio(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
         if ((p->addr & PAGE_MASK) == IOAPIC_DEFAULT_BASE_ADDRESS)
                 goto mmio;
         vcpu->mmio_needed = 1;
-        vcpu->mmio_phys_addr = kvm_run->mmio.phys_addr = p->addr;
-        vcpu->mmio_size = kvm_run->mmio.len = p->size;
+        vcpu->mmio_fragments[0].gpa = kvm_run->mmio.phys_addr = p->addr;
+        vcpu->mmio_fragments[0].len = kvm_run->mmio.len = p->size;
         vcpu->mmio_is_write = kvm_run->mmio.is_write = !p->dir;
 
         if (vcpu->mmio_is_write)
-                memcpy(vcpu->mmio_data, &p->data, p->size);
+                memcpy(vcpu->arch.mmio_data, &p->data, p->size);
         memcpy(kvm_run->mmio.data, &p->data, p->size);
         kvm_run->exit_reason = KVM_EXIT_MMIO;
         return 0;
@@ -719,7 +719,7 @@ static void kvm_set_mmio_data(struct kvm_vcpu *vcpu)
         struct kvm_mmio_req *p = kvm_get_vcpu_ioreq(vcpu);
 
         if (!vcpu->mmio_is_write)
-                memcpy(&p->data, vcpu->mmio_data, 8);
+                memcpy(&p->data, vcpu->arch.mmio_data, 8);
         p->state = STATE_IORESP_READY;
 }
 
@@ -739,7 +739,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
         }
 
         if (vcpu->mmio_needed) {
-                memcpy(vcpu->mmio_data, kvm_run->mmio.data, 8);
+                memcpy(vcpu->arch.mmio_data, kvm_run->mmio.data, 8);
                 kvm_set_mmio_data(vcpu);
                 vcpu->mmio_read_completed = 1;
                 vcpu->mmio_needed = 0;
@@ -1872,21 +1872,6 @@ void kvm_arch_hardware_unsetup(void)
 {
 }
 
-void kvm_vcpu_kick(struct kvm_vcpu *vcpu)
-{
-        int me;
-        int cpu = vcpu->cpu;
-
-        if (waitqueue_active(&vcpu->wq))
-                wake_up_interruptible(&vcpu->wq);
-
-        me = get_cpu();
-        if (cpu != me && (unsigned) cpu < nr_cpu_ids && cpu_online(cpu))
-                if (!test_and_set_bit(KVM_REQ_KICK, &vcpu->requests))
-                        smp_send_reschedule(cpu);
-        put_cpu();
-}
-
 int kvm_apic_set_irq(struct kvm_vcpu *vcpu, struct kvm_lapic_irq *irq)
 {
         return __apic_accept_irq(vcpu, irq->vector);
@@ -1956,6 +1941,11 @@ int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu)
                 (kvm_highest_pending_irq(vcpu) != -1);
 }
 
+int kvm_arch_vcpu_should_kick(struct kvm_vcpu *vcpu)
+{
+        return (!test_and_set_bit(KVM_REQ_KICK, &vcpu->requests));
+}
+
 int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu,
                                     struct kvm_mp_state *mp_state)
 {