KVM: PPC: Add helpers for CR, XER

We now have helpers for the GPRs, so let's also add some for CR and XER.

Having them in the PACA simplifies code a lot, as we don't need to care
about where to store CC or not to overflow any integers.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
index 49af80e4a6e1..338baf9f6b28 100644
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@ -449,10 +449,10 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)
         int i;
 
         regs->pc = vcpu->arch.pc;
-        regs->cr = vcpu->arch.cr;
+        regs->cr = kvmppc_get_cr(vcpu);
         regs->ctr = vcpu->arch.ctr;
         regs->lr = vcpu->arch.lr;
-        regs->xer = vcpu->arch.xer;
+        regs->xer = kvmppc_get_xer(vcpu);
         regs->msr = vcpu->arch.msr;
         regs->srr0 = vcpu->arch.srr0;
         regs->srr1 = vcpu->arch.srr1;
@@ -476,10 +476,10 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)
         int i;
 
         vcpu->arch.pc = regs->pc;
-        vcpu->arch.cr = regs->cr;
+        kvmppc_set_cr(vcpu, regs->cr);
         vcpu->arch.ctr = regs->ctr;
         vcpu->arch.lr = regs->lr;
-        vcpu->arch.xer = regs->xer;
+        kvmppc_set_xer(vcpu, regs->xer);
         kvmppc_set_msr(vcpu, regs->msr);
         vcpu->arch.srr0 = regs->srr0;
         vcpu->arch.srr1 = regs->srr1;