From 0ff25ba8470a0f24ef6a8e5ade48eaebe054c9a3 Mon Sep 17 00:00:00 2001 From: "Jason J. herne" Date: Tue, 15 May 2012 14:15:28 +0200 Subject: [PATCH] --- yaml --- r: 307912 b: refs/heads/master c: 46a6dd1c87c4ff17202574127daf70cc0bb38d6d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/include/asm/kvm.h | 2 ++ trunk/arch/s390/kvm/kvm-s390.c | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f81efb7223c4..1ee39164c024 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 29b7c71b5ecf2caaa4c2105ecc0094826db8a8a8 +refs/heads/master: 46a6dd1c87c4ff17202574127daf70cc0bb38d6d diff --git a/trunk/arch/s390/include/asm/kvm.h b/trunk/arch/s390/include/asm/kvm.h index 53a53720830a..bdcbe0f8dd7b 100644 --- a/trunk/arch/s390/include/asm/kvm.h +++ b/trunk/arch/s390/include/asm/kvm.h @@ -55,4 +55,6 @@ struct kvm_sync_regs { #define KVM_REG_S390_TODPR (KVM_REG_S390 | KVM_REG_SIZE_U32 | 0x1) #define KVM_REG_S390_EPOCHDIFF (KVM_REG_S390 | KVM_REG_SIZE_U64 | 0x2) +#define KVM_REG_S390_CPU_TIMER (KVM_REG_S390 | KVM_REG_SIZE_U64 | 0x3) +#define KVM_REG_S390_CLOCK_COMP (KVM_REG_S390 | KVM_REG_SIZE_U64 | 0x4) #endif diff --git a/trunk/arch/s390/kvm/kvm-s390.c b/trunk/arch/s390/kvm/kvm-s390.c index cc4c01322ce4..664766d0c83c 100644 --- a/trunk/arch/s390/kvm/kvm-s390.c +++ b/trunk/arch/s390/kvm/kvm-s390.c @@ -454,6 +454,14 @@ static int kvm_arch_vcpu_ioctl_get_one_reg(struct kvm_vcpu *vcpu, r = put_user(vcpu->arch.sie_block->epoch, (u64 __user *)reg->addr); break; + case KVM_REG_S390_CPU_TIMER: + r = put_user(vcpu->arch.sie_block->cputm, + (u64 __user *)reg->addr); + break; + case KVM_REG_S390_CLOCK_COMP: + r = put_user(vcpu->arch.sie_block->ckc, + (u64 __user *)reg->addr); + break; default: break; } @@ -475,6 +483,14 @@ static int kvm_arch_vcpu_ioctl_set_one_reg(struct kvm_vcpu *vcpu, r = get_user(vcpu->arch.sie_block->epoch, (u64 __user *)reg->addr); break; + case KVM_REG_S390_CPU_TIMER: + r = get_user(vcpu->arch.sie_block->cputm, + (u64 __user *)reg->addr); + break; + case KVM_REG_S390_CLOCK_COMP: + r = get_user(vcpu->arch.sie_block->ckc, + (u64 __user *)reg->addr); + break; default: break; }