diff options
| author | James Hogan | 2015-04-24 12:26:52 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2015-07-16 20:00:20 +0200 |
| commit | f8b3e48b2d269551cd40f94770dc20da2f402325 (patch) | |
| tree | 9fdc95c0696679b5a26213e884de6c4751d51a8b /target-mips | |
| parent | Merge remote-tracking branch 'remotes/lalrae/tags/mips-20150716' into staging (diff) | |
| download | qemu-f8b3e48b2d269551cd40f94770dc20da2f402325.tar.gz qemu-f8b3e48b2d269551cd40f94770dc20da2f402325.tar.xz qemu-f8b3e48b2d269551cd40f94770dc20da2f402325.zip | |
mips/kvm: Fix Big endian 32-bit register access
Fix access to 32-bit registers on big endian targets. The pointer passed
to the kernel must be for the actual 32-bit value, not a temporary
64-bit value, otherwise on big endian systems the kernel will only
interpret the upper half.
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>
Cc: kvm@vger.kernel.org
Cc: qemu-stable@nongnu.org
Message-Id: <1429871214-23514-2-git-send-email-james.hogan@imgtec.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'target-mips')
| -rw-r--r-- | target-mips/kvm.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/target-mips/kvm.c b/target-mips/kvm.c index bd64a70bcd..85256f3104 100644 --- a/target-mips/kvm.c +++ b/target-mips/kvm.c @@ -235,10 +235,9 @@ int kvm_mips_set_ipi_interrupt(MIPSCPU *cpu, int irq, int level) static inline int kvm_mips_put_one_reg(CPUState *cs, uint64_t reg_id, int32_t *addr) { - uint64_t val64 = *addr; struct kvm_one_reg cp0reg = { .id = reg_id, - .addr = (uintptr_t)&val64 + .addr = (uintptr_t)addr }; return kvm_vcpu_ioctl(cs, KVM_SET_ONE_REG, &cp0reg); @@ -270,18 +269,12 @@ static inline int kvm_mips_put_one_reg64(CPUState *cs, uint64_t reg_id, static inline int kvm_mips_get_one_reg(CPUState *cs, uint64_t reg_id, int32_t *addr) { - int ret; - uint64_t val64 = 0; struct kvm_one_reg cp0reg = { .id = reg_id, - .addr = (uintptr_t)&val64 + .addr = (uintptr_t)addr }; - ret = kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, &cp0reg); - if (ret >= 0) { - *addr = val64; - } - return ret; + return kvm_vcpu_ioctl(cs, KVM_GET_ONE_REG, &cp0reg); } static inline int kvm_mips_get_one_ulreg(CPUState *cs, uint64 reg_id, |