diff options
| author | Rusty Russell <rusty.russell@linaro.org> | 2012-07-17 12:08:45 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty.russell@linaro.org> | 2012-07-17 12:08:45 +0930 |
| commit | 2eaac840619afa18a7c71cf8aa0f54868bb38569 (patch) | |
| tree | c169643ec1f71a888597a9822b8fe1e8803beed3 | |
| parent | 2f7a8b3f5d5f1167d82d12cef1fcf80803e69753 (diff) | |
| download | linux-kvm-arm-msr-ops.tar.gz | |
ARM: KVM: Remove cp15 registers from struct kvm_regs.msr-ops
This will break QEMU: it now needs to use the
KVM_GET_MSR_INDEX_LIST/KVM_GET_MSRS/KVM_SET_MSRS ioctls.
Signed-off-by: Rusty Russell <rusty.russell@linaro.org>
| -rw-r--r-- | arch/arm/include/asm/kvm.h | 9 | ||||
| -rw-r--r-- | arch/arm/kvm/guest.c | 17 |
2 files changed, 0 insertions, 26 deletions
diff --git a/arch/arm/include/asm/kvm.h b/arch/arm/include/asm/kvm.h index b928a2492956e..d040a2ac97fc9 100644 --- a/arch/arm/include/asm/kvm.h +++ b/arch/arm/include/asm/kvm.h @@ -57,15 +57,6 @@ struct kvm_regs { __u32 reg15; __u32 cpsr; __u32 spsr[5]; /* Banked SPSR, indexed by MODE_ */ - struct { - __u32 c0_midr; - __u32 c1_sys; - __u32 c2_base0; - __u32 c2_base1; - __u32 c2_control; - __u32 c3_dacr; - } cp15; - }; /* Supported Processor Types */ diff --git a/arch/arm/kvm/guest.c b/arch/arm/kvm/guest.c index 32fded5d502b3..d842d2879654e 100644 --- a/arch/arm/kvm/guest.c +++ b/arch/arm/kvm/guest.c @@ -80,17 +80,6 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) regs->reg15 = vcpu_regs->pc; regs->cpsr = vcpu_regs->cpsr; - - /* - * Co-processor registers. - */ - regs->cp15.c0_midr = vcpu->arch.cp15[c0_MIDR]; - regs->cp15.c1_sys = vcpu->arch.cp15[c1_SCTLR]; - regs->cp15.c2_base0 = vcpu->arch.cp15[c2_TTBR0]; - regs->cp15.c2_base1 = vcpu->arch.cp15[c2_TTBR1]; - regs->cp15.c2_control = vcpu->arch.cp15[c2_TTBCR]; - regs->cp15.c3_dacr = vcpu->arch.cp15[c3_DACR]; - return 0; } @@ -124,12 +113,6 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs) vcpu_regs->abt_regs[2] = regs->spsr[MODE_ABT]; vcpu_regs->und_regs[2] = regs->spsr[MODE_UND]; - /* - * Co-processor registers. - */ - vcpu->arch.cp15[c0_MIDR] = regs->cp15.c0_midr; - vcpu->arch.cp15[c1_SCTLR] = regs->cp15.c1_sys; - vcpu_regs->pc = regs->reg15; vcpu_regs->cpsr = regs->cpsr; |