From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LRW1X-0003Vj-AE for qemu-devel@nongnu.org; Mon, 26 Jan 2009 13:17:27 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LRW1V-0003Uk-7j for qemu-devel@nongnu.org; Mon, 26 Jan 2009 13:17:26 -0500 Received: from [199.232.76.173] (port=40812 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LRW1V-0003UZ-3N for qemu-devel@nongnu.org; Mon, 26 Jan 2009 13:17:25 -0500 Received: from lizzard.sbs.de ([194.138.37.39]:15572) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1LRW1U-0000kx-Fc for qemu-devel@nongnu.org; Mon, 26 Jan 2009 13:17:24 -0500 Received: from mail1.sbs.de (localhost [127.0.0.1]) by lizzard.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id n0QIHMG0027292 for ; Mon, 26 Jan 2009 19:17:22 +0100 Received: from [139.25.109.167] (mchn012c.mchp.siemens.de [139.25.109.167] (may be forged)) by mail1.sbs.de (8.12.11.20060308/8.12.11) with ESMTP id n0QIHMRQ003372 for ; Mon, 26 Jan 2009 19:17:22 +0100 Message-ID: <497DFE36.6070501@siemens.com> Date: Mon, 26 Jan 2009 19:17:26 +0100 From: Jan Kiszka MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [RESEND #?][PATCH 2/2] x86: Issue reset on triple faults Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel As discussed a few times on this list: A triple fault causes a system reset on x86, and some guests make use of this (e.g. 386BSD). To keep the chance of tracing unexpected resets, log them if CPU_LOG_RESET is set. Signed-off-by: Jan Kiszka --- target-i386/op_helper.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/target-i386/op_helper.c b/target-i386/op_helper.c index 1a615b3..8cf3bb2 100644 --- a/target-i386/op_helper.c +++ b/target-i386/op_helper.c @@ -1251,6 +1251,9 @@ void do_interrupt(int intno, int is_int, int error_code, } } +/* This should come from sysemu.h - if we could include it here... */ +void qemu_system_reset_request(void); + /* * Check nested exceptions and change to double or triple fault if * needed. It should only be called, if this is not an interrupt. @@ -1267,8 +1270,18 @@ static int check_exception(int intno, int *error_code) qemu_log_mask(CPU_LOG_INT, "check_exception old: 0x%x new 0x%x\n", env->old_exception, intno); - if (env->old_exception == EXCP08_DBLE) - cpu_abort(env, "triple fault"); +#if !defined(CONFIG_USER_ONLY) + if (env->old_exception == EXCP08_DBLE) { + if (env->hflags & HF_SVMI_MASK) + helper_vmexit(SVM_EXIT_SHUTDOWN, 0); /* does not return */ + + if (loglevel & CPU_LOG_RESET) + fprintf(logfile, "Triple fault\n"); + + qemu_system_reset_request(); + return EXCP_HLT; + } +#endif if ((first_contributory && second_contributory) || (env->old_exception == EXCP0E_PAGE &&