aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Borntraeger <borntraeger@de.ibm.com>2014-02-10 09:39:23 -0500
committerChristian Borntraeger <borntraeger@de.ibm.com>2014-03-04 04:41:01 -0500
commitafa45ff521130cee79a50b565693388be8c8c9c2 (patch)
tree0e445ab6a4d8eecc0c78d422143ff9dddef19e34
parent672550fb682e9935e1a318bf4ac3f611a057dee1 (diff)
KVM: s390: expose gbea register to userspace
For migration/reset we want to expose the guest breaking event address register to userspace. Lets use ONE_REG for that purpose. Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> Reviewed-by: Jason J. Herne <jjherne@linux.vnet.ibm.com>
-rw-r--r--arch/s390/include/uapi/asm/kvm.h1
-rw-r--r--arch/s390/kvm/kvm-s390.c8
2 files changed, 9 insertions, 0 deletions
diff --git a/arch/s390/include/uapi/asm/kvm.h b/arch/s390/include/uapi/asm/kvm.h
index 766324476f12..2f0ade24f96a 100644
--- a/arch/s390/include/uapi/asm/kvm.h
+++ b/arch/s390/include/uapi/asm/kvm.h
@@ -77,4 +77,5 @@ struct kvm_sync_regs {
77#define KVM_REG_S390_PFCOMPARE (KVM_REG_S390 | KVM_REG_SIZE_U64 | 0x6) 77#define KVM_REG_S390_PFCOMPARE (KVM_REG_S390 | KVM_REG_SIZE_U64 | 0x6)
78#define KVM_REG_S390_PFSELECT (KVM_REG_S390 | KVM_REG_SIZE_U64 | 0x7) 78#define KVM_REG_S390_PFSELECT (KVM_REG_S390 | KVM_REG_SIZE_U64 | 0x7)
79#define KVM_REG_S390_PP (KVM_REG_S390 | KVM_REG_SIZE_U64 | 0x8) 79#define KVM_REG_S390_PP (KVM_REG_S390 | KVM_REG_SIZE_U64 | 0x8)
80#define KVM_REG_S390_GBEA (KVM_REG_S390 | KVM_REG_SIZE_U64 | 0x9)
80#endif 81#endif
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 0262936e18be..a3e4c07ec3a5 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -576,6 +576,10 @@ static int kvm_arch_vcpu_ioctl_get_one_reg(struct kvm_vcpu *vcpu,
576 r = put_user(vcpu->arch.sie_block->pp, 576 r = put_user(vcpu->arch.sie_block->pp,
577 (u64 __user *)reg->addr); 577 (u64 __user *)reg->addr);
578 break; 578 break;
579 case KVM_REG_S390_GBEA:
580 r = put_user(vcpu->arch.sie_block->gbea,
581 (u64 __user *)reg->addr);
582 break;
579 default: 583 default:
580 break; 584 break;
581 } 585 }
@@ -621,6 +625,10 @@ static int kvm_arch_vcpu_ioctl_set_one_reg(struct kvm_vcpu *vcpu,
621 r = get_user(vcpu->arch.sie_block->pp, 625 r = get_user(vcpu->arch.sie_block->pp,
622 (u64 __user *)reg->addr); 626 (u64 __user *)reg->addr);
623 break; 627 break;
628 case KVM_REG_S390_GBEA:
629 r = get_user(vcpu->arch.sie_block->gbea,
630 (u64 __user *)reg->addr);
631 break;
624 default: 632 default:
625 break; 633 break;
626 } 634 }