From mboxrd@z Thu Jan  1 00:00:00 1970
From: Magnus Damm <magnus@valinux.co.jp>
Subject: [PATCH] hvm: disable on smp
Date: Fri, 29 Sep 2006 15:44:31 +0900
Message-ID: <20060929064431.24864.50465.sendpatchset@localhost>
References: <20060929064425.24864.5149.sendpatchset@localhost>
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <20060929064425.24864.5149.sendpatchset@localhost>
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
Cc: Magnus Damm <magnus@valinux.co.jp>, magnus.damm@gmail.com
List-Id: xen-devel@lists.xenproject.org

hvm: disable hvm on smp

With Intel VT, VMXOFF needs to be executed before halting the CPU. Without 
this fix Xen or Linux is unable to start up the CPU after a kexec reboot.

Tested using x86_32 on a Pentium D 930.

Signed-Off-By: Magnus Damm <magnus@valinux.co.jp>

--- 0001/xen/arch/x86/smp.c
+++ work/xen/arch/x86/smp.c	2006-09-29 14:47:34.000000000 +0900
@@ -21,6 +21,7 @@
 #include <asm/smpboot.h>
 #include <asm/hardirq.h>
 #include <asm/ipi.h>
+#include <asm/hvm/hvm.h>
 #include <mach_apic.h>
 
 /*
@@ -306,6 +307,7 @@ static void stop_this_cpu (void *dummy)
 
     local_irq_disable();
     disable_local_APIC();
+    hvm_disable();
 
     for ( ; ; )
         __asm__ __volatile__ ( "hlt" );