[RFC v4][PATCH 1/2] intel_txt: KVM shutdown fix

[RFC v4][PATCH 1/2] intel_txt: KVM shutdown fix

[Joseph Cihula]

Fix KVM to disable itself under all shutdown conditions.  In additional to being good practice, Intel(R) TXT requires VMX to be disabled on all CPUs in order for TXT to be disabled.

In kvm.git, as f878b14017f.

Signed-off-by: Sheng Yang <sheng@linux.intel.com>
Signed-off-by: Joseph Cihula <joseph.cihula@intel.com>
---
 kvm_main.c |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

--- linux-2.6.30-rc4/virt/kvm/kvm_main.c	2009-04-29 21:48:16.000000000 -0700
+++ linux-2.6.30-rc4-lkml/virt/kvm/kvm_main.c	2009-05-07 13:27:03.000000000 -0700
@@ -2112,15 +2112,15 @@ EXPORT_SYMBOL_GPL(kvm_handle_fault_on_re
 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;
 }