diff options
author | Lai Jiangshan <laijs@cn.fujitsu.com> | 2010-04-17 05:00:19 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2010-05-17 05:18:04 -0400 |
commit | 66cbff59a16017234ea6c80ecddfc17b27a83504 (patch) | |
tree | e2a1dde14cb9b60434f4f8c4bef424817c2b2df4 /virt | |
parent | 87bc3bf972af0585ba5415aebbc8bd09b6a2ee94 (diff) |
KVM: do not call hardware_disable() on CPU_UP_CANCELED
When CPU_UP_CANCELED, hardware_enable() has not been called at the CPU
which is going up because raw_notifier_call_chain(CPU_ONLINE)
has not been called for this cpu.
Drop the handling for CPU_UP_CANCELED.
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'virt')
-rw-r--r-- | virt/kvm/kvm_main.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 4901ec5061ba..6dc940455e8b 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c | |||
@@ -1931,11 +1931,6 @@ static int kvm_cpu_hotplug(struct notifier_block *notifier, unsigned long val, | |||
1931 | cpu); | 1931 | cpu); |
1932 | hardware_disable(NULL); | 1932 | hardware_disable(NULL); |
1933 | break; | 1933 | break; |
1934 | case CPU_UP_CANCELED: | ||
1935 | printk(KERN_INFO "kvm: disabling virtualization on CPU%d\n", | ||
1936 | cpu); | ||
1937 | smp_call_function_single(cpu, hardware_disable, NULL, 1); | ||
1938 | break; | ||
1939 | case CPU_ONLINE: | 1934 | case CPU_ONLINE: |
1940 | printk(KERN_INFO "kvm: enabling virtualization on CPU%d\n", | 1935 | printk(KERN_INFO "kvm: enabling virtualization on CPU%d\n", |
1941 | cpu); | 1936 | cpu); |