KVM: Drop kvm_arch_vcpu_setup()

[linux.git] / arch / powerpc / kvm / booke.c

diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
index be9a45874194f3b49c99417cffc00dea0be6e1ba..9cb8257b41187f48cccf9e2983013a6bde55657a 100644 (file)
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@ -1377,36 +1377,6 @@ static void kvmppc_set_tsr(struct kvm_vcpu *vcpu, u32 new_tsr)
        update_timer_ints(vcpu);
 }
 
-/* Initial guest state: 16MB mapping 0 -> 0, PC = 0, MSR = 0, R1 = 16MB */
-int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
-{
-       int i;
-       int r;
-
-       vcpu->arch.regs.nip = 0;
-       vcpu->arch.shared->pir = vcpu->vcpu_id;
-       kvmppc_set_gpr(vcpu, 1, (16<<20) - 8); /* -8 for the callee-save LR slot */
-       kvmppc_set_msr(vcpu, 0);
-
-#ifndef CONFIG_KVM_BOOKE_HV
-       vcpu->arch.shadow_msr = MSR_USER | MSR_IS | MSR_DS;
-       vcpu->arch.shadow_pid = 1;
-       vcpu->arch.shared->msr = 0;
-#endif
-
-       /* Eye-catching numbers so we know if the guest takes an interrupt
-        * before it's programmed its own IVPR/IVORs. */
-       vcpu->arch.ivpr = 0x55550000;
-       for (i = 0; i < BOOKE_IRQPRIO_MAX; i++)
-               vcpu->arch.ivor[i] = 0x7700 | i * 4;
-
-       kvmppc_init_timing_stats(vcpu);
-
-       r = kvmppc_core_vcpu_setup(vcpu);
-       kvmppc_sanity_check(vcpu);
-       return r;
-}
-
 int kvmppc_subarch_vcpu_init(struct kvm_vcpu *vcpu)
 {
        /* setup watchdog timer once */
@@ -2114,9 +2084,40 @@ int kvmppc_core_init_vm(struct kvm *kvm)
        return kvm->arch.kvm_ops->init_vm(kvm);
 }
 
-struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm, unsigned int id)
+int kvmppc_core_vcpu_create(struct kvm_vcpu *vcpu)
 {
-       return kvm->arch.kvm_ops->vcpu_create(kvm, id);
+       int i;
+       int r;
+
+       r = vcpu->kvm->arch.kvm_ops->vcpu_create(vcpu);
+       if (r)
+               return r;
+
+       /* Initial guest state: 16MB mapping 0 -> 0, PC = 0, MSR = 0, R1 = 16MB */
+       vcpu->arch.regs.nip = 0;
+       vcpu->arch.shared->pir = vcpu->vcpu_id;
+       kvmppc_set_gpr(vcpu, 1, (16<<20) - 8); /* -8 for the callee-save LR slot */
+       kvmppc_set_msr(vcpu, 0);
+
+#ifndef CONFIG_KVM_BOOKE_HV
+       vcpu->arch.shadow_msr = MSR_USER | MSR_IS | MSR_DS;
+       vcpu->arch.shadow_pid = 1;
+       vcpu->arch.shared->msr = 0;
+#endif
+
+       /* Eye-catching numbers so we know if the guest takes an interrupt
+        * before it's programmed its own IVPR/IVORs. */
+       vcpu->arch.ivpr = 0x55550000;
+       for (i = 0; i < BOOKE_IRQPRIO_MAX; i++)
+               vcpu->arch.ivor[i] = 0x7700 | i * 4;
+
+       kvmppc_init_timing_stats(vcpu);
+
+       r = kvmppc_core_vcpu_setup(vcpu);
+       if (r)
+               vcpu->kvm->arch.kvm_ops->vcpu_free(vcpu);
+       kvmppc_sanity_check(vcpu);
+       return r;
 }
 
 void kvmppc_core_vcpu_free(struct kvm_vcpu *vcpu)