diff options
| author | Christoffer Dall <christoffer.dall@linaro.org> | 2013-12-11 20:29:11 -0800 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-04-30 11:15:00 +0200 |
| commit | a9ae6f03a85a4108027dc764eeb9625b59f58b0c (patch) | |
| tree | 2d8506aa5a8b0679d0f819e822d0f39a0d340abb /arch | |
| parent | 69a023a70ac77b581f11f12ea61d065fc3bf79fc (diff) | |
arm/arm64: kvm: Set vcpu->cpu to -1 on vcpu_put
commit e9b152cb957cb194437f37e79f0f3c9d34fe53d6 upstream.
The arch-generic KVM code expects the cpu field of a vcpu to be -1 if
the vcpu is no longer assigned to a cpu. This is used for the optimized
make_all_cpus_request path and will be used by the vgic code to check
that no vcpus are running.
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/kvm/arm.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index 9cf07789337f..d45c36c31e8c 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -340,6 +340,13 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu) { + /* + * The arch-generic KVM code expects the cpu field of a vcpu to be -1 + * if the vcpu is no longer assigned to a cpu. This is used for the + * optimized make_all_cpus_request path. + */ + vcpu->cpu = -1; + kvm_arm_set_running_vcpu(NULL); } |