From: "Jan Beulich" Subject: [PATCH] x86: fix reboot on non-hvm-capable machines Date: Wed, 28 Feb 2007 11:22:28 +0000 Message-ID: <45E57404.76E4.0078.0@novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org c/s 14080 made the call to hvm_funcs.disable unconditional, but on machines not capable of (or with disabled) VMX/SVM the function pointer is NULL. Signed-off-by: Jan Beulich Index: 2007-02-27/xen/include/asm-x86/hvm/hvm.h =================================================================== --- 2007-02-27.orig/xen/include/asm-x86/hvm/hvm.h 2007-02-26 14:59:09.000000000 +0100 +++ 2007-02-27/xen/include/asm-x86/hvm/hvm.h 2007-02-28 10:39:57.000000000 +0100 @@ -139,6 +139,7 @@ struct hvm_function_table { }; extern struct hvm_function_table hvm_funcs; +extern int hvm_enabled; /* * For convenience, we use short hands. @@ -146,7 +147,8 @@ extern struct hvm_function_table hvm_fun static inline void hvm_disable(void) { - hvm_funcs.disable(); + if (hvm_enabled) + hvm_funcs.disable(); } int hvm_domain_initialise(struct domain *d);