KVM: Move virtualization deactivation from CPU_DEAD state to CPU_DOWN_PREPARE

43934a38 · Jeremy Katz <[email protected]> · 2007-02-19 14:37:46 +02:00

This gives it more chances of surviving suspend.

Signed-off-by: Jeremy Katz <[email protected]>
Signed-off-by: Avi Kivity <[email protected]>

Changes

1 files changed · +6 −2

File	Status	Add	Del	Content
drivers/kvm/kvm_main.c	modified	+6	−2	View file

diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
index af86614..0a96c2c 100644
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -2080,13 +2080,17 @@ static int kvm_cpu_hotplug(struct notifier_block *notifier, unsigned long val,
 	int cpu = (long)v;
 
 	switch (val) {
-	case CPU_DEAD:
+	case CPU_DOWN_PREPARE:
 	case CPU_UP_CANCELED:
+		printk(KERN_INFO "kvm: disabling virtualization on CPU%d\n",
+		       cpu);
 		decache_vcpus_on_cpu(cpu);
 		smp_call_function_single(cpu, kvm_arch_ops->hardware_disable,
 					 NULL, 0, 1);
 		break;
-	case CPU_UP_PREPARE:
+	case CPU_ONLINE:
+		printk(KERN_INFO "kvm: enabling virtualization on CPU%d\n",
+		       cpu);
 		smp_call_function_single(cpu, kvm_arch_ops->hardware_enable,
 					 NULL, 0, 1);
 		break;