From b10a8b72f714933818a1b8ccc7df550772a97b8d Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Mon, 13 Aug 2012 14:50:54 +0200 Subject: [PATCH] --- yaml --- r: 343476 b: refs/heads/master c: 50c871edf59b4585fd2c17acfe4e7cd3752418b7 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kvm/booke_emulate.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 081bb91d5012..4381542b9669 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 491dd5b8a4926393308172da80c73faf242a4057 +refs/heads/master: 50c871edf59b4585fd2c17acfe4e7cd3752418b7 diff --git a/trunk/arch/powerpc/kvm/booke_emulate.c b/trunk/arch/powerpc/kvm/booke_emulate.c index cc99a0b3d202..514790f41aba 100644 --- a/trunk/arch/powerpc/kvm/booke_emulate.c +++ b/trunk/arch/powerpc/kvm/booke_emulate.c @@ -237,6 +237,9 @@ int kvmppc_booke_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, ulong spr_val) case SPRN_IVOR15: vcpu->arch.ivor[BOOKE_IRQPRIO_DEBUG] = spr_val; break; + case SPRN_MCSR: + vcpu->arch.mcsr &= ~spr_val; + break; default: emulated = EMULATE_FAIL; @@ -329,6 +332,9 @@ int kvmppc_booke_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, ulong *spr_val) case SPRN_IVOR15: *spr_val = vcpu->arch.ivor[BOOKE_IRQPRIO_DEBUG]; break; + case SPRN_MCSR: + *spr_val = vcpu->arch.mcsr; + break; default: emulated = EMULATE_FAIL;