6 files changed, 29 insertions, 38 deletions

diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile
index 1089b3e918ac..db3d7c5d1071 100644
--- a/arch/ia64/kvm/Makefile
+++ b/arch/ia64/kvm/Makefile
@@ -45,8 +45,8 @@ FORCE : $(obj)/$(offsets-file)
 # Makefile for Kernel-based Virtual Machine module
 #
 
-EXTRA_CFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/
-EXTRA_AFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/
+ccflags-y := -Ivirt/kvm -Iarch/ia64/kvm/
+asflags-y := -Ivirt/kvm -Iarch/ia64/kvm/
 
 common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \
                 coalesced_mmio.o irq_comm.o assigned-dev.o)
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index f56a6316e134..8213efe1998c 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -662,6 +662,7 @@ again:
                 goto vcpu_run_fail;
 
         srcu_read_unlock(&vcpu->kvm->srcu, idx);
+        vcpu->mode = IN_GUEST_MODE;
         kvm_guest_enter();
 
         /*
@@ -683,6 +684,7 @@ again:
          */
         barrier();
         kvm_guest_exit();
+        vcpu->mode = OUTSIDE_GUEST_MODE;
         preempt_enable();
 
         idx = srcu_read_lock(&vcpu->kvm->srcu);
@@ -749,7 +751,7 @@ out:
         return r;
 }
 
-static struct kvm *kvm_alloc_kvm(void)
+struct kvm *kvm_arch_alloc_vm(void)
 {
 
         struct kvm *kvm;
@@ -760,7 +762,7 @@ static struct kvm *kvm_alloc_kvm(void)
         vm_base = __get_free_pages(GFP_KERNEL, get_order(KVM_VM_DATA_SIZE));
 
         if (!vm_base)
-                return ERR_PTR(-ENOMEM);
+                return NULL;
 
         memset((void *)vm_base, 0, KVM_VM_DATA_SIZE);
         kvm = (struct kvm *)(vm_base +
@@ -806,10 +808,12 @@ static void kvm_build_io_pmt(struct kvm *kvm)
 #define GUEST_PHYSICAL_RR4      0x2739
 #define VMM_INIT_RR             0x1660
 
-static void kvm_init_vm(struct kvm *kvm)
+int kvm_arch_init_vm(struct kvm *kvm)
 {
         BUG_ON(!kvm);
 
+        kvm->arch.is_sn2 = ia64_platform_is("sn2");
+
         kvm->arch.metaphysical_rr0 = GUEST_PHYSICAL_RR0;
         kvm->arch.metaphysical_rr4 = GUEST_PHYSICAL_RR4;
         kvm->arch.vmm_init_rr = VMM_INIT_RR;
@@ -823,21 +827,8 @@ static void kvm_init_vm(struct kvm *kvm)
 
         /* Reserve bit 0 of irq_sources_bitmap for userspace irq source */
         set_bit(KVM_USERSPACE_IRQ_SOURCE_ID, &kvm->arch.irq_sources_bitmap);
-}
-
-struct  kvm *kvm_arch_create_vm(void)
-{
-        struct kvm *kvm = kvm_alloc_kvm();
-
-        if (IS_ERR(kvm))
-                return ERR_PTR(-ENOMEM);
-
-        kvm->arch.is_sn2 = ia64_platform_is("sn2");
-
-        kvm_init_vm(kvm);
-
-        return kvm;
 
+        return 0;
 }
 
 static int kvm_vm_ioctl_get_irqchip(struct kvm *kvm,
@@ -962,7 +953,9 @@ long kvm_arch_vm_ioctl(struct file *filp,
                         goto out;
                 r = kvm_setup_default_irq_routing(kvm);
                 if (r) {
+                        mutex_lock(&kvm->slots_lock);
                         kvm_ioapic_destroy(kvm);
+                        mutex_unlock(&kvm->slots_lock);
                         goto out;
                 }
                 break;
@@ -1357,7 +1350,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
         return -EINVAL;
 }
 
-static void free_kvm(struct kvm *kvm)
+void kvm_arch_free_vm(struct kvm *kvm)
 {
         unsigned long vm_base = kvm->arch.vm_base;
 
@@ -1399,9 +1392,6 @@ void kvm_arch_destroy_vm(struct kvm *kvm)
 #endif
         kfree(kvm->arch.vioapic);
         kvm_release_vm_pages(kvm);
-        kvm_free_physmem(kvm);
-        cleanup_srcu_struct(&kvm->srcu);
-        free_kvm(kvm);
 }
 
 void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu)
diff --git a/arch/ia64/kvm/lapic.h b/arch/ia64/kvm/lapic.h
index ee541cebcd78..c5f92a926a9a 100644
--- a/arch/ia64/kvm/lapic.h
+++ b/arch/ia64/kvm/lapic.h
@@ -25,5 +25,6 @@ int kvm_apic_match_dest(struct kvm_vcpu *vcpu, struct kvm_lapic *source,
 int kvm_apic_compare_prio(struct kvm_vcpu *vcpu1, struct kvm_vcpu *vcpu2);
 int kvm_apic_set_irq(struct kvm_vcpu *vcpu, struct kvm_lapic_irq *irq);
 #define kvm_apic_present(x) (true)
+#define kvm_lapic_enabled(x) (true)
 
 #endif
diff --git a/arch/ia64/kvm/mmio.c b/arch/ia64/kvm/mmio.c
index fb8f9f59a1ed..f1e17d3d6cd9 100644
--- a/arch/ia64/kvm/mmio.c
+++ b/arch/ia64/kvm/mmio.c
@@ -130,7 +130,7 @@ static void mmio_access(struct kvm_vcpu *vcpu, u64 src_pa, u64 *dest,
 
         local_irq_save(psr);
 
-        /*Intercept the acces for PIB range*/
+        /*Intercept the access for PIB range*/
         if (iot == GPFN_PIB) {
                 if (!dir)
                         lsapic_write(vcpu, src_pa, s, *dest);
diff --git a/arch/ia64/kvm/process.c b/arch/ia64/kvm/process.c
index bb862fb224f2..b0398740b48d 100644
--- a/arch/ia64/kvm/process.c
+++ b/arch/ia64/kvm/process.c
@@ -987,7 +987,7 @@ static void vmm_sanity_check(struct kvm_vcpu *vcpu)
 
 static void kvm_do_resume_op(struct kvm_vcpu *vcpu)
 {
-        vmm_sanity_check(vcpu); /*Guarantee vcpu runing on healthy vmm!*/
+        vmm_sanity_check(vcpu); /*Guarantee vcpu running on healthy vmm!*/
 
         if (test_and_clear_bit(KVM_REQ_RESUME, &vcpu->requests)) {
                 vcpu_do_resume(vcpu);
diff --git a/arch/ia64/kvm/vti.h b/arch/ia64/kvm/vti.h
index f6c5617e16af..b214b5b0432d 100644
--- a/arch/ia64/kvm/vti.h
+++ b/arch/ia64/kvm/vti.h
@@ -83,13 +83,13 @@
 union vac {
         unsigned long value;
         struct {
-                int a_int:1;
-                int a_from_int_cr:1;
-                int a_to_int_cr:1;
-                int a_from_psr:1;
-                int a_from_cpuid:1;
-                int a_cover:1;
-                int a_bsw:1;
+                unsigned int a_int:1;
+                unsigned int a_from_int_cr:1;
+                unsigned int a_to_int_cr:1;
+                unsigned int a_from_psr:1;
+                unsigned int a_from_cpuid:1;
+                unsigned int a_cover:1;
+                unsigned int a_bsw:1;
                 long reserved:57;
         };
 };
@@ -97,12 +97,12 @@ union vac {
 union vdc {
         unsigned long value;
         struct {
-                int d_vmsw:1;
-                int d_extint:1;
-                int d_ibr_dbr:1;
-                int d_pmc:1;
-                int d_to_pmd:1;
-                int d_itm:1;
+                unsigned int d_vmsw:1;
+                unsigned int d_extint:1;
+                unsigned int d_ibr_dbr:1;
+                unsigned int d_pmc:1;
+                unsigned int d_to_pmd:1;
+                unsigned int d_itm:1;
                 long reserved:58;
         };
 };