# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1167821625 0
# Node ID 968c9d322b887de9fc01ccac0d35bd80a2905e1c
# Parent f60c305186b4de7159b4bda6f47df88c0a12ed58
[HVM][SVM] Triple faulkts (shutdown state) causes domain reset.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
xen/arch/x86/hvm/hvm.c | 6 ++++--
xen/arch/x86/hvm/svm/svm.c | 22 +++++-----------------
2 files changed, 9 insertions(+), 19 deletions(-)
diff -r f60c305186b4 -r 968c9d322b88 xen/arch/x86/hvm/hvm.c
--- a/xen/arch/x86/hvm/hvm.c Wed Jan 03 10:01:32 2007 +0000
+++ b/xen/arch/x86/hvm/hvm.c Wed Jan 03 10:53:45 2007 +0000
@@ -271,8 +271,10 @@ void hvm_hlt(unsigned long rflags)
void hvm_triple_fault(void)
{
- gdprintk(XENLOG_INFO, "Triple fault - reset.\n");
- domain_shutdown(current->domain, SHUTDOWN_reboot);
+ struct vcpu *v = current;
+ gdprintk(XENLOG_INFO, "Triple fault on VCPU%d - "
+ "invoking HVM system reset.\n", v->vcpu_id);
+ domain_shutdown(v->domain, SHUTDOWN_reboot);
}
/*
diff -r f60c305186b4 -r 968c9d322b88 xen/arch/x86/hvm/svm/svm.c
--- a/xen/arch/x86/hvm/svm/svm.c Wed Jan 03 10:01:32 2007 +0000
+++ b/xen/arch/x86/hvm/svm/svm.c Wed Jan 03 10:53:45 2007 +0000
@@ -2701,23 +2701,14 @@ asmlinkage void svm_vmexit_handler(struc
}
break;
+ case VMEXIT_INTR:
case VMEXIT_NMI:
- break;
-
case VMEXIT_SMI:
- /*
- * For asynchronous SMI's, we just need to allow global interrupts
- * so that the SMI is taken properly in the context of the host. The
- * standard code does a STGI after the VMEXIT which should accomplish
- * this task. Continue as normal and restart the guest.
- */
+ /* Asynchronous events, handled when we STGI'd after the VMEXIT. */
break;
case VMEXIT_INIT:
- /*
- * Nothing to do, in fact we should never get to this point.
- */
- break;
+ BUG(); /* unreachable */
case VMEXIT_EXCEPTION_BP:
#ifdef XEN_DEBUGGER
@@ -2779,9 +2770,6 @@ asmlinkage void svm_vmexit_handler(struc
vmcb->general1_intercepts &= ~GENERAL1_INTERCEPT_VINTR;
break;
- case VMEXIT_INTR:
- break;
-
case VMEXIT_INVD:
svm_vmexit_do_invd(vmcb);
break;
@@ -2867,8 +2855,8 @@ asmlinkage void svm_vmexit_handler(struc
break;
case VMEXIT_SHUTDOWN:
- gdprintk(XENLOG_ERR, "Guest shutdown exit\n");
- goto exit_and_crash;
+ hvm_triple_fault();
+ break;
default:
exit_and_crash:
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home