WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-devel

[Xen-devel] [PATCH] x86: fix reboot on non-hvm-capable machines

To: <xen-devel@xxxxxxxxxxxxxxxxxxx>
Subject: [Xen-devel] [PATCH] x86: fix reboot on non-hvm-capable machines
From: "Jan Beulich" <jbeulich@xxxxxxxxxx>
Date: Wed, 28 Feb 2007 11:22:28 +0000
Delivery-date: Wed, 28 Feb 2007 03:22:40 -0800
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-id: Xen developer discussion <xen-devel.lists.xensource.com>
List-post: <mailto:xen-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>, <mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-devel-bounces@xxxxxxxxxxxxxxxxxxx
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 <jbeulich@xxxxxxxxxx>

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);



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel

<Prev in Thread] Current Thread [Next in Thread>
  • [Xen-devel] [PATCH] x86: fix reboot on non-hvm-capable machines, Jan Beulich <=