From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:59028)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1aaoVS-000712-1c
	for qemu-devel@nongnu.org; Tue, 01 Mar 2016 12:54:46 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1aaoVQ-0003Mu-Vr
	for qemu-devel@nongnu.org; Tue, 01 Mar 2016 12:54:45 -0500
Received: from mail-vk0-x231.google.com ([2607:f8b0:400c:c05::231]:36104)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <peter.maydell@linaro.org>) id 1aaoVQ-0003Mp-Gg
	for qemu-devel@nongnu.org; Tue, 01 Mar 2016 12:54:44 -0500
Received: by mail-vk0-x231.google.com with SMTP id c3so175763031vkb.3
	for <qemu-devel@nongnu.org>; Tue, 01 Mar 2016 09:54:44 -0800 (PST)
MIME-Version: 1.0
In-Reply-To: <56D5D716.4020903@redhat.com>
References: <1456808869-20286-1-git-send-email-sw@weilnetz.de>
	<CAFEAcA-juCnm=-MnTZx+e481GtjLDP0SAk7Wmyo54nKUjh0Z3w@mail.gmail.com>
	<56D58309.10206@weilnetz.de>
	<CAFEAcA_g2mYVECDDEVX8Gs_374oL5Qy6t+unpbfaNKd5dT5pLg@mail.gmail.com>
	<56D595F4.50804@weilnetz.de>
	<BLUPR0301MB20343A51B6AEAF14B5B4742D9EBB0@BLUPR0301MB2034.namprd03.prod.outlook.com>
	<56D5D716.4020903@redhat.com>
From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 1 Mar 2016 17:54:24 +0000
Message-ID: <CAFEAcA_e4isOAW5QBgxEKRWbhy1kAzv6acqPXQbO3a4hfJ5XWg@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8
Subject: Re: [Qemu-devel] [PATCH] Use special code for sigsetjmp only in
	cpu-exec.c
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: Stefan Weil <sw@weilnetz.de>, Peter Crosthwaite <crosthwaite.peter@gmail.com>, QEMU Developer <qemu-devel@nongnu.org>, Andrew Baumann <Andrew.Baumann@microsoft.com>, Richard Henderson <rth@twiddle.net>

On 1 March 2016 at 17:53, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
>
> On 01/03/2016 18:46, Andrew Baumann wrote:
>> --- a/include/sysemu/os-win32.h
>> +++ b/include/sysemu/os-win32.h
>> @@ -60,6 +60,7 @@
>>   * If this parameter is NULL, longjump does no stack unwinding.
>>   * That is what we need for QEMU. Passing the value of register rsp (default)
>>   * lets longjmp try a stack unwinding which will crash with generated code. */
>> +# include <setjmp.h>
>>  # undef setjmp
>>  # define setjmp(env) _setjmp(env, NULL)
>>  #endif
>
> I like this patch or the similar:
>
> diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
> index 4538fdc..322a7da 100644
> --- a/include/qemu/osdep.h
> +++ b/include/qemu/osdep.h
> @@ -77,6 +77,8 @@ extern int daemon(int, int);
>  #include <sys/time.h>
>  #include <assert.h>
>  #include <signal.h>
> +/* This is needed on Mingw-w64 where we redefine setjmp below.  */
> +#include <setjmp.h>
>
>  #ifdef __OpenBSD__
>  #include <sys/signal.h>
>
> which also includes the file on POSIX systems.

Yes, that would get my vote. (Followup cleanup -- remove the now
unneeded includes of setjmp.h elsewhere.)

thanks
-- PMM