OSDN Git Service

KVM: arm64: pvtime: steal-time is only supported when configured
authorAndrew Jones <drjones@redhat.com>
Tue, 4 Aug 2020 17:05:59 +0000 (19:05 +0200)
committerMarc Zyngier <maz@kernel.org>
Fri, 21 Aug 2020 13:04:14 +0000 (14:04 +0100)
Don't confuse the guest by saying steal-time is supported when
it hasn't been configured by userspace and won't work.

Signed-off-by: Andrew Jones <drjones@redhat.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20200804170604.42662-2-drjones@redhat.com
arch/arm64/kvm/pvtime.c

index f7b52ce..c3ef4eb 100644 (file)
@@ -43,7 +43,8 @@ long kvm_hypercall_pv_features(struct kvm_vcpu *vcpu)
        switch (feature) {
        case ARM_SMCCC_HV_PV_TIME_FEATURES:
        case ARM_SMCCC_HV_PV_TIME_ST:
-               val = SMCCC_RET_SUCCESS;
+               if (vcpu->arch.steal.base != GPA_INVALID)
+                       val = SMCCC_RET_SUCCESS;
                break;
        }