aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Daney <david.daney@cavium.com>2013-05-23 09:49:07 -0700
committerGleb Natapov <gleb@redhat.com>2013-06-03 10:58:53 +0300
commitbf32ebf66d74e8a196256d7ac2a4f3c6938c614a (patch)
treeaa159215cf78c6e25eb4ea598f9a0bcbc46266ba
parent688cded320a4760de679160b42f9a81face02674 (diff)
downloadvexpress-lsk-bf32ebf66d74e8a196256d7ac2a4f3c6938c614a.tar.gz
mips/kvm: Fix name of gpr field in struct kvm_regs.
Signed-off-by: David Daney <david.daney@cavium.com> Acked-by: Sanjay Lal <sanjayl@kymasys.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--arch/mips/include/uapi/asm/kvm.h3
-rw-r--r--arch/mips/kvm/kvm_mips.c4
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/mips/include/uapi/asm/kvm.h b/arch/mips/include/uapi/asm/kvm.h
index 86812fb6184..d145ead16b2 100644
--- a/arch/mips/include/uapi/asm/kvm.h
+++ b/arch/mips/include/uapi/asm/kvm.h
@@ -26,7 +26,8 @@
* extended to 64-bits.
*/
struct kvm_regs {
- __u64 gprs[32];
+ /* out (KVM_GET_REGS) / in (KVM_SET_REGS) */
+ __u64 gpr[32];
__u64 hi;
__u64 lo;
__u64 pc;
diff --git a/arch/mips/kvm/kvm_mips.c b/arch/mips/kvm/kvm_mips.c
index e0dad028979..93da7508c6b 100644
--- a/arch/mips/kvm/kvm_mips.c
+++ b/arch/mips/kvm/kvm_mips.c
@@ -678,7 +678,7 @@ int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)
int i;
for (i = 0; i < 32; i++)
- vcpu->arch.gprs[i] = regs->gprs[i];
+ vcpu->arch.gprs[i] = regs->gpr[i];
vcpu->arch.hi = regs->hi;
vcpu->arch.lo = regs->lo;
@@ -692,7 +692,7 @@ int kvm_arch_vcpu_ioctl_get_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)
int i;
for (i = 0; i < 32; i++)
- regs->gprs[i] = vcpu->arch.gprs[i];
+ regs->gpr[i] = vcpu->arch.gprs[i];
regs->hi = vcpu->arch.hi;
regs->lo = vcpu->arch.lo;