diff options
Diffstat (limited to 'virt')
-rw-r--r-- | virt/kvm/kvm_main.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 2d29e260da3d..d4eae6af0738 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c | |||
@@ -1266,12 +1266,12 @@ static int kvm_cpu_hotplug(struct notifier_block *notifier, unsigned long val, | |||
1266 | case CPU_UP_CANCELED: | 1266 | case CPU_UP_CANCELED: |
1267 | printk(KERN_INFO "kvm: disabling virtualization on CPU%d\n", | 1267 | printk(KERN_INFO "kvm: disabling virtualization on CPU%d\n", |
1268 | cpu); | 1268 | cpu); |
1269 | smp_call_function_single(cpu, hardware_disable, NULL, 0, 1); | 1269 | smp_call_function_single(cpu, hardware_disable, NULL, 1); |
1270 | break; | 1270 | break; |
1271 | case CPU_ONLINE: | 1271 | case CPU_ONLINE: |
1272 | printk(KERN_INFO "kvm: enabling virtualization on CPU%d\n", | 1272 | printk(KERN_INFO "kvm: enabling virtualization on CPU%d\n", |
1273 | cpu); | 1273 | cpu); |
1274 | smp_call_function_single(cpu, hardware_enable, NULL, 0, 1); | 1274 | smp_call_function_single(cpu, hardware_enable, NULL, 1); |
1275 | break; | 1275 | break; |
1276 | } | 1276 | } |
1277 | return NOTIFY_OK; | 1277 | return NOTIFY_OK; |
@@ -1286,7 +1286,7 @@ static int kvm_reboot(struct notifier_block *notifier, unsigned long val, | |||
1286 | * in vmx root mode. | 1286 | * in vmx root mode. |
1287 | */ | 1287 | */ |
1288 | printk(KERN_INFO "kvm: exiting hardware virtualization\n"); | 1288 | printk(KERN_INFO "kvm: exiting hardware virtualization\n"); |
1289 | on_each_cpu(hardware_disable, NULL, 0, 1); | 1289 | on_each_cpu(hardware_disable, NULL, 1); |
1290 | } | 1290 | } |
1291 | return NOTIFY_OK; | 1291 | return NOTIFY_OK; |
1292 | } | 1292 | } |
@@ -1474,12 +1474,12 @@ int kvm_init(void *opaque, unsigned int vcpu_size, | |||
1474 | for_each_online_cpu(cpu) { | 1474 | for_each_online_cpu(cpu) { |
1475 | smp_call_function_single(cpu, | 1475 | smp_call_function_single(cpu, |
1476 | kvm_arch_check_processor_compat, | 1476 | kvm_arch_check_processor_compat, |
1477 | &r, 0, 1); | 1477 | &r, 1); |
1478 | if (r < 0) | 1478 | if (r < 0) |
1479 | goto out_free_1; | 1479 | goto out_free_1; |
1480 | } | 1480 | } |
1481 | 1481 | ||
1482 | on_each_cpu(hardware_enable, NULL, 0, 1); | 1482 | on_each_cpu(hardware_enable, NULL, 1); |
1483 | r = register_cpu_notifier(&kvm_cpu_notifier); | 1483 | r = register_cpu_notifier(&kvm_cpu_notifier); |
1484 | if (r) | 1484 | if (r) |
1485 | goto out_free_2; | 1485 | goto out_free_2; |
@@ -1525,7 +1525,7 @@ out_free_3: | |||
1525 | unregister_reboot_notifier(&kvm_reboot_notifier); | 1525 | unregister_reboot_notifier(&kvm_reboot_notifier); |
1526 | unregister_cpu_notifier(&kvm_cpu_notifier); | 1526 | unregister_cpu_notifier(&kvm_cpu_notifier); |
1527 | out_free_2: | 1527 | out_free_2: |
1528 | on_each_cpu(hardware_disable, NULL, 0, 1); | 1528 | on_each_cpu(hardware_disable, NULL, 1); |
1529 | out_free_1: | 1529 | out_free_1: |
1530 | kvm_arch_hardware_unsetup(); | 1530 | kvm_arch_hardware_unsetup(); |
1531 | out_free_0: | 1531 | out_free_0: |
@@ -1547,7 +1547,7 @@ void kvm_exit(void) | |||
1547 | sysdev_class_unregister(&kvm_sysdev_class); | 1547 | sysdev_class_unregister(&kvm_sysdev_class); |
1548 | unregister_reboot_notifier(&kvm_reboot_notifier); | 1548 | unregister_reboot_notifier(&kvm_reboot_notifier); |
1549 | unregister_cpu_notifier(&kvm_cpu_notifier); | 1549 | unregister_cpu_notifier(&kvm_cpu_notifier); |
1550 | on_each_cpu(hardware_disable, NULL, 0, 1); | 1550 | on_each_cpu(hardware_disable, NULL, 1); |
1551 | kvm_arch_hardware_unsetup(); | 1551 | kvm_arch_hardware_unsetup(); |
1552 | kvm_arch_exit(); | 1552 | kvm_arch_exit(); |
1553 | kvm_exit_debug(); | 1553 | kvm_exit_debug(); |