1 files changed, 8 insertions, 0 deletions

diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index cc0d7f1b19ab..bf66ec731e8f 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -510,6 +510,9 @@ struct kvm_vcpu *kvmppc_core_vcpu_create(struct kvm *kvm, unsigned int id)
         spin_unlock(&vcore->lock);
         vcpu->arch.vcore = vcore;
 
+        vcpu->arch.cpu_type = KVM_CPU_3S_64;
+        kvmppc_sanity_check(vcpu);
+
         return vcpu;
 
 free_vcpu:
@@ -800,6 +803,11 @@ int kvmppc_vcpu_run(struct kvm_run *run, struct kvm_vcpu *vcpu)
 {
         int r;
 
+        if (!vcpu->arch.sane) {
+                run->exit_reason = KVM_EXIT_INTERNAL_ERROR;
+                return -EINVAL;
+        }
+
         do {
                 r = kvmppc_run_vcpu(run, vcpu);