1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index b19734606cd9..9ea9277014aa 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -255,14 +255,22 @@ int kvm_vcpu_init(struct kvm_vcpu *vcpu, struct kvm *kvm, unsigned id)
         if (r < 0)
                 goto fail_free_pio_data;
 
+        if (irqchip_in_kernel(kvm)) {
+                r = kvm_create_lapic(vcpu);
+                if (r < 0)
+                        goto fail_mmu_destroy;
+        }
+
         return 0;
 
+fail_mmu_destroy:
+        kvm_mmu_destroy(vcpu);
 fail_free_pio_data:
         free_page((unsigned long)vcpu->pio_data);
 fail_free_run:
         free_page((unsigned long)vcpu->run);
 fail:
-        return -ENOMEM;
+        return r;
 }
 EXPORT_SYMBOL_GPL(kvm_vcpu_init);