|
@@ -125,6 +125,15 @@ static void __vcpu_clear(void *arg)
|
|
|
per_cpu(current_vmcs, cpu) = NULL;
|
|
|
}
|
|
|
|
|
|
+static void vcpu_clear(struct kvm_vcpu *vcpu)
|
|
|
+{
|
|
|
+ if (vcpu->cpu != raw_smp_processor_id() && vcpu->cpu != -1)
|
|
|
+ smp_call_function_single(vcpu->cpu, __vcpu_clear, vcpu, 0, 1);
|
|
|
+ else
|
|
|
+ __vcpu_clear(vcpu);
|
|
|
+ vcpu->launched = 0;
|
|
|
+}
|
|
|
+
|
|
|
static unsigned long vmcs_readl(unsigned long field)
|
|
|
{
|
|
|
unsigned long value;
|
|
@@ -202,10 +211,8 @@ static struct kvm_vcpu *vmx_vcpu_load(struct kvm_vcpu *vcpu)
|
|
|
|
|
|
cpu = get_cpu();
|
|
|
|
|
|
- if (vcpu->cpu != cpu) {
|
|
|
- smp_call_function(__vcpu_clear, vcpu, 0, 1);
|
|
|
- vcpu->launched = 0;
|
|
|
- }
|
|
|
+ if (vcpu->cpu != cpu)
|
|
|
+ vcpu_clear(vcpu);
|
|
|
|
|
|
if (per_cpu(current_vmcs, cpu) != vcpu->vmcs) {
|
|
|
u8 error;
|