| Message ID | 1426087371-16166-2-git-send-email-james.hogan@imgtec.com |
|---|---|
| State | New |
| Headers | show |
On 11/03/2015 15:22, James Hogan wrote: > The KVM_REG_MIPS_COUNT_* definitions are now included in > linux-headers/asm-mips/kvm.h since commit b061808d39fa ("linux-headers: > update linux headers to kvm/next"), therefore the duplicate definitions > in target-mips/kvm.c can now be dropped. > > Signed-off-by: James Hogan <james.hogan@imgtec.com> > Cc: Paolo Bonzini <pbonzini@redhat.com> > Cc: Leon Alrae <leon.alrae@imgtec.com> > Cc: Aurelien Jarno <aurelien@aurel32.net> > --- > target-mips/kvm.c | 11 ----------- > 1 file changed, 11 deletions(-) Reviewed-by: Leon Alrae <leon.alrae@imgtec.com>
diff --git a/target-mips/kvm.c b/target-mips/kvm.c index b68191c88e87..49e71b3791b7 100644 --- a/target-mips/kvm.c +++ b/target-mips/kvm.c @@ -226,17 +226,6 @@ int kvm_mips_set_ipi_interrupt(MIPSCPU *cpu, int irq, int level) #define KVM_REG_MIPS_CP0_EPC MIPS_CP0_64(14, 0) #define KVM_REG_MIPS_CP0_ERROREPC MIPS_CP0_64(30, 0) -/* CP0_Count control */ -#define KVM_REG_MIPS_COUNT_CTL (KVM_REG_MIPS | KVM_REG_SIZE_U64 | \ - 0x20000 | 0) -#define KVM_REG_MIPS_COUNT_CTL_DC 0x00000001 /* master disable */ -/* CP0_Count resume monotonic nanoseconds */ -#define KVM_REG_MIPS_COUNT_RESUME (KVM_REG_MIPS | KVM_REG_SIZE_U64 | \ - 0x20000 | 1) -/* CP0_Count rate in Hz */ -#define KVM_REG_MIPS_COUNT_HZ (KVM_REG_MIPS | KVM_REG_SIZE_U64 | \ - 0x20000 | 2) - static inline int kvm_mips_put_one_reg(CPUState *cs, uint64_t reg_id, int32_t *addr) {
The KVM_REG_MIPS_COUNT_* definitions are now included in linux-headers/asm-mips/kvm.h since commit b061808d39fa ("linux-headers: update linux headers to kvm/next"), therefore the duplicate definitions in target-mips/kvm.c can now be dropped. Signed-off-by: James Hogan <james.hogan@imgtec.com> Cc: Paolo Bonzini <pbonzini@redhat.com> Cc: Leon Alrae <leon.alrae@imgtec.com> Cc: Aurelien Jarno <aurelien@aurel32.net> --- target-mips/kvm.c | 11 ----------- 1 file changed, 11 deletions(-)