diff options
| author |   Marc Zyngier <maz@kernel.org> | 2019-10-24 15:04:09 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2019-10-24 15:04:09 +0100 |
| commit | a4b28f5c67983d92c911ca1404728bc4ea958c0e (patch) | |
| tree | 9e33ce5332ee983a7424fe6146f91f2f4f551a15 /arch/arm64/kvm/guest.c | |
| parent | KVM: arm/arm64: Allow user injection of external data aborts (diff) | |
| parent | KVM: arm64: Select TASK_DELAY_ACCT+TASKSTATS rather than SCHEDSTATS (diff) | |
| download | linux-dev-a4b28f5c67983d92c911ca1404728bc4ea958c0e.tar.xz linux-dev-a4b28f5c67983d92c911ca1404728bc4ea958c0e.zip | |
Merge remote-tracking branch 'kvmarm/kvm-arm64/stolen-time' into kvmarm-master/next
Diffstat (limited to 'arch/arm64/kvm/guest.c')
| -rw-r--r-- | arch/arm64/kvm/guest.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c index ca613a44c6ec..cd4429bfe5dc 100644 --- a/arch/arm64/kvm/guest.c +++ b/arch/arm64/kvm/guest.c @@ -868,6 +868,9 @@ int kvm_arm_vcpu_arch_set_attr(struct kvm_vcpu *vcpu, case KVM_ARM_VCPU_TIMER_CTRL: ret = kvm_arm_timer_set_attr(vcpu, attr); break; + case KVM_ARM_VCPU_PVTIME_CTRL: + ret = kvm_arm_pvtime_set_attr(vcpu, attr); + break; default: ret = -ENXIO; break; @@ -888,6 +891,9 @@ int kvm_arm_vcpu_arch_get_attr(struct kvm_vcpu *vcpu, case KVM_ARM_VCPU_TIMER_CTRL: ret = kvm_arm_timer_get_attr(vcpu, attr); break; + case KVM_ARM_VCPU_PVTIME_CTRL: + ret = kvm_arm_pvtime_get_attr(vcpu, attr); + break; default: ret = -ENXIO; break; @@ -908,6 +914,9 @@ int kvm_arm_vcpu_arch_has_attr(struct kvm_vcpu *vcpu, case KVM_ARM_VCPU_TIMER_CTRL: ret = kvm_arm_timer_has_attr(vcpu, attr); break; + case KVM_ARM_VCPU_PVTIME_CTRL: + ret = kvm_arm_pvtime_has_attr(vcpu, attr); + break; default: ret = -ENXIO; break; |