From 9c58c9eda39da231452c1c64a5a7a2a841024a56 Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Wed, 29 Apr 2009 11:09:04 +0800 Subject: [PATCH] --- yaml --- r: 146571 b: refs/heads/master c: 8e1c18157d8772e65247ac55525a05a26b83fffe h: refs/heads/master i: 146569: 9d7bf9a3e7d715b300e9d3900b411b9eb500f8b3 146567: 559d17c2316d4a8233fdb43a7c3da1ca046e821c v: v3 --- [refs] | 2 +- trunk/virt/kvm/kvm_main.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 8ecd3355fb24..631e330f6b55 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 522c68c4416de3cd3e11a9ff10d58e776a69ae1e +refs/heads/master: 8e1c18157d8772e65247ac55525a05a26b83fffe diff --git a/trunk/virt/kvm/kvm_main.c b/trunk/virt/kvm/kvm_main.c index 63d5fa2bc84a..29c0afb064da 100644 --- a/trunk/virt/kvm/kvm_main.c +++ b/trunk/virt/kvm/kvm_main.c @@ -2391,15 +2391,15 @@ EXPORT_SYMBOL_GPL(kvm_handle_fault_on_reboot); static int kvm_reboot(struct notifier_block *notifier, unsigned long val, void *v) { - if (val == SYS_RESTART) { - /* - * Some (well, at least mine) BIOSes hang on reboot if - * in vmx root mode. - */ - printk(KERN_INFO "kvm: exiting hardware virtualization\n"); - kvm_rebooting = true; - on_each_cpu(hardware_disable, NULL, 1); - } + /* + * Some (well, at least mine) BIOSes hang on reboot if + * in vmx root mode. + * + * And Intel TXT required VMX off for all cpu when system shutdown. + */ + printk(KERN_INFO "kvm: exiting hardware virtualization\n"); + kvm_rebooting = true; + on_each_cpu(hardware_disable, NULL, 1); return NOTIFY_OK; }