diff options
author | Christoffer Dall <christoffer.dall@linaro.org> | 2014-10-16 10:14:43 -0400 |
---|---|---|
committer | Christoffer Dall <christoffer.dall@linaro.org> | 2014-12-13 08:15:25 -0500 |
commit | 3ad8b3de526a76fbe9466b366059e4958957b88f (patch) | |
tree | 8fc888631918c186df6ed6cca144560f3ee3afe8 /arch/arm/kvm | |
parent | 03f1d4c17edb31b41b14ca3a749ae38d2dd6639d (diff) |
arm/arm64: KVM: Correct KVM_ARM_VCPU_INIT power off option
The implementation of KVM_ARM_VCPU_INIT is currently not doing what
userspace expects, namely making sure that a vcpu which may have been
turned off using PSCI is returned to its initial state, which would be
powered on if userspace does not set the KVM_ARM_VCPU_POWER_OFF flag.
Implement the expected functionality and clarify the ABI.
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Diffstat (limited to 'arch/arm/kvm')
-rw-r--r-- | arch/arm/kvm/arm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index b160beadc956..edc196412abe 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c | |||
@@ -663,6 +663,8 @@ static int kvm_arch_vcpu_ioctl_vcpu_init(struct kvm_vcpu *vcpu, | |||
663 | */ | 663 | */ |
664 | if (test_bit(KVM_ARM_VCPU_POWER_OFF, vcpu->arch.features)) | 664 | if (test_bit(KVM_ARM_VCPU_POWER_OFF, vcpu->arch.features)) |
665 | vcpu->arch.pause = true; | 665 | vcpu->arch.pause = true; |
666 | else | ||
667 | vcpu->arch.pause = false; | ||
666 | 668 | ||
667 | return 0; | 669 | return 0; |
668 | } | 670 | } |