Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Lu7pZ-0004ZM-Tb for qemu-devel@nongnu.org; Wed, 15 Apr 2009 12:19:22 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Lu7pZ-0004Z1-4P for qemu-devel@nongnu.org; Wed, 15 Apr 2009 12:19:21 -0400 Received: from [199.232.76.173] (port=51333 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lu7pY-0004Yv-UA for qemu-devel@nongnu.org; Wed, 15 Apr 2009 12:19:21 -0400 Received: from hall.aurel32.net ([88.191.82.174]:36307) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1Lu7pY-0004US-Gi for qemu-devel@nongnu.org; Wed, 15 Apr 2009 12:19:20 -0400 Date: Wed, 15 Apr 2009 18:19:19 +0200 From: Aurelien Jarno Subject: Re: [Qemu-devel] [PATCH 10/10] linux-user: Proper exit code for uncaught signals Message-ID: <20090415161919.GH26206@hall.aurel32.net> References: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: Sender: Aurelien Jarno Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Riku Voipio Cc: qemu-devel@nongnu.org On Sun, Apr 05, 2009 at 11:59:26PM +0300, riku.voipio@iki.fi wrote: > From: Riku Voipio > > The proper exit code for dieing from an uncaught signal is -. > The kernel doesn't allow exit() or _exit() to pass a negative value. > To get the proper exit code we need to actually die from an uncaught signal. > > A default signal handler is installed, we send ourself a signal > and we wait for it to arrive. > > Patch originates from Scratchbox > > Signed-off-by: Riku Voipio > --- > linux-user/signal.c | 37 +++++++++++++++++++++++++------------ > 1 files changed, 25 insertions(+), 12 deletions(-) Thanks, applied. > diff --git a/linux-user/signal.c b/linux-user/signal.c > index fc37dc1..7504725 100644 > --- a/linux-user/signal.c > +++ b/linux-user/signal.c > @@ -25,6 +25,7 @@ > #include > #include > #include > +#include > #include > > #include "qemu.h" > @@ -352,22 +353,34 @@ static inline void free_sigqueue(CPUState *env, struct sigqueue *q) > static void QEMU_NORETURN force_sig(int sig) > { > int host_sig; > + struct sigaction act; > host_sig = target_to_host_signal(sig); > fprintf(stderr, "qemu: uncaught target signal %d (%s) - exiting\n", > sig, strsignal(host_sig)); > -#if 1 > gdb_signalled(thread_env, sig); > - _exit(-host_sig); > -#else > - { > - struct sigaction act; > - sigemptyset(&act.sa_mask); > - act.sa_flags = SA_SIGINFO; > - act.sa_sigaction = SIG_DFL; > - sigaction(SIGABRT, &act, NULL); > - abort(); > - } > -#endif > + > + /* The proper exit code for dieing from an uncaught signal is > + * -. The kernel doesn't allow exit() or _exit() to pass > + * a negative value. To get the proper exit code we need to > + * actually die from an uncaught signal. Here the default signal > + * handler is installed, we send ourself a signal and we wait for > + * it to arrive. */ > + sigfillset(&act.sa_mask); > + act.sa_handler = SIG_DFL; > + sigaction(host_sig, &act, NULL); > + > + /* For some reason raise(host_sig) doesn't send the signal when > + * statically linked on x86-64. */ > + kill(getpid(), host_sig); > + > + /* Make sure the signal isn't masked (just reuse the mask inside > + of act) */ > + sigdelset(&act.sa_mask, host_sig); > + sigsuspend(&act.sa_mask); > + > + /* unreachable */ > + assert(0); > + > } > > /* queue a signal so that it will be send to the virtual CPU as soon > -- > 1.6.2.1 > > > > -- Aurelien Jarno GPG: 1024D/F1BCDB73 aurelien@aurel32.net http://www.aurel32.net