From 0363bf39c4a07d55ea0a11f8b0bc9c68af726317 Mon Sep 17 00:00:00 2001 From: Scott Wood Date: Fri, 2 Sep 2011 17:39:37 -0500 Subject: [PATCH] --- yaml --- r: 297071 b: refs/heads/master c: 841741f23b91088810e657a535b8aa683136d870 h: refs/heads/master i: 297069: 7aa866fae17a286ca650322f0aeaf84438cdb3a8 297067: d88b6f20f2087294e5ab9ffdb6231802b9a6da20 297063: d02e495aa58db9747e01d107028e3fc5e6c2bfdd 297055: dc9cc3242b0333e4a074e5fa3f97dbb1d182c862 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kvm/booke.c | 4 ++-- trunk/arch/powerpc/kvm/e500.c | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 0d8893290c19..66ed6d9134bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 303b7c97e369ec3d7ab7ba0551030160ce3f838a +refs/heads/master: 841741f23b91088810e657a535b8aa683136d870 diff --git a/trunk/arch/powerpc/kvm/booke.c b/trunk/arch/powerpc/kvm/booke.c index bb6c988f010a..b64220079d56 100644 --- a/trunk/arch/powerpc/kvm/booke.c +++ b/trunk/arch/powerpc/kvm/booke.c @@ -761,7 +761,7 @@ static void get_sregs_arch206(struct kvm_vcpu *vcpu, { sregs->u.e.features |= KVM_SREGS_E_ARCH206; - sregs->u.e.pir = 0; + sregs->u.e.pir = vcpu->vcpu_id; sregs->u.e.mcsrr0 = vcpu->arch.mcsrr0; sregs->u.e.mcsrr1 = vcpu->arch.mcsrr1; sregs->u.e.decar = vcpu->arch.decar; @@ -774,7 +774,7 @@ static int set_sregs_arch206(struct kvm_vcpu *vcpu, if (!(sregs->u.e.features & KVM_SREGS_E_ARCH206)) return 0; - if (sregs->u.e.pir != 0) + if (sregs->u.e.pir != vcpu->vcpu_id) return -EINVAL; vcpu->arch.mcsrr0 = sregs->u.e.mcsrr0; diff --git a/trunk/arch/powerpc/kvm/e500.c b/trunk/arch/powerpc/kvm/e500.c index f17d7e732a1e..ac3c4bf21677 100644 --- a/trunk/arch/powerpc/kvm/e500.c +++ b/trunk/arch/powerpc/kvm/e500.c @@ -71,9 +71,6 @@ int kvmppc_core_vcpu_setup(struct kvm_vcpu *vcpu) vcpu->arch.pvr = mfspr(SPRN_PVR); vcpu_e500->svr = mfspr(SPRN_SVR); - /* Since booke kvm only support one core, update all vcpus' PIR to 0 */ - vcpu->vcpu_id = 0; - vcpu->arch.cpu_type = KVM_CPU_E500V2; return 0;