x86: fix reboot on non-hvm-capable machines
PATCH 1/1 x86: fix reboot on non-hvm-capable machines
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 <[email protected]>
xen/include/asm-x86/hvm/hvm.h +3 -1
@@ -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_funstatic inline void hvm_disable (void ) { - hvm_funcs.disable (); +if (hvm_enabled) + hvm_funcs.disable (); }int hvm_domain_initialise (struct domain *d);