| Message ID | 1240974544-18744-1-git-send-email-sheng@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Sheng Yang wrote: > Intel TXT(Trusted Execution Technology) required VMX off for all cpu to work > when system shutdown. > Applied, thanks. Is this needed for 2.6.30 and -stable? That is, is the code that enables TXT in 2.6.30 and below or in the BIOS? Or is it new code not yet merged?
> From: Avi Kivity [mailto:avi@redhat.com] > Sent: Thursday, April 30, 2009 5:31 AM > > Sheng Yang wrote: > > Intel TXT(Trusted Execution Technology) required VMX off for all cpu to work > > when system shutdown. > > > > Applied, thanks. > > Is this needed for 2.6.30 and -stable? That is, is the code that > enables TXT in 2.6.30 and below or in the BIOS? Or is it new code not > yet merged? The TXT code will not get merged in 2.6.30, though it will hopefully make it soon thereafter. So it would be fine to put it in 2.6.31. Joe
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 3265566..2b73e19 100644 --- a/virt/kvm/kvm_main.c +++ b/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; }
Intel TXT(Trusted Execution Technology) required VMX off for all cpu to work when system shutdown. CC: Joseph Cihula <joseph.cihula@intel.com> Signed-off-by: Sheng Yang <sheng@linux.intel.com> --- virt/kvm/kvm_main.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-)