[ 039/173] KVM: PPC: 44x: fix DCR read/write
From: Ben Hutchings <hidden>
Date: 2012-12-28 19:19:57
Also in:
lkml
3.2-stable review patch. If anyone has any objections, please let me know. ------------------ From: Alexander Graf <redacted> commit e43a028752fed049e4bd94ef895542f96d79fa74 upstream. When remembering the direction of a DCR transaction, we should write to the same variable that we interpret on later when doing vcpu_run again. Signed-off-by: Alexander Graf <redacted> [bwh: Backported to 3.2: adjust context, indentation] Signed-off-by: Ben Hutchings <redacted> --- arch/powerpc/kvm/44x_emulate.c | 2 ++ 1 file changed, 2 insertions(+)
--- a/arch/powerpc/kvm/44x_emulate.c
+++ b/arch/powerpc/kvm/44x_emulate.c@@ -79,6 +79,7 @@ int kvmppc_core_emulate_op(struct kvm_ru run->dcr.dcrn = dcrn; run->dcr.data = 0; run->dcr.is_write = 0; + vcpu->arch.dcr_is_write = 0; vcpu->arch.io_gpr = rt; vcpu->arch.dcr_needed = 1; kvmppc_account_exit(vcpu, DCR_EXITS);
@@ -100,6 +101,7 @@ int kvmppc_core_emulate_op(struct kvm_ru run->dcr.dcrn = dcrn; run->dcr.data = kvmppc_get_gpr(vcpu, rs); run->dcr.is_write = 1; + vcpu->arch.dcr_is_write = 1; vcpu->arch.dcr_needed = 1; kvmppc_account_exit(vcpu, DCR_EXITS); emulated = EMULATE_DO_DCR;