Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43934a38 authored by Jeremy Katz's avatar Jeremy Katz Committed by Avi Kivity
Browse files

KVM: Move virtualization deactivation from CPU_DEAD state to CPU_DOWN_PREPARE 



This gives it more chances of surviving suspend.

Signed-off-by: default avatarJeremy Katz <katzj@redhat.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent bf3f8e86

drivers/kvm/kvm_main.c

+6 −2
Original line number Diff line number Diff line
@@ -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;