From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:38882)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1ZN20I-000665-OF
	for qemu-devel@nongnu.org; Wed, 05 Aug 2015 12:57:23 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1ZN20E-000702-3A
	for qemu-devel@nongnu.org; Wed, 05 Aug 2015 12:57:22 -0400
Received: from mx1.redhat.com ([209.132.183.28]:45595)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <pbonzini@redhat.com>) id 1ZN20D-0006zi-V0
	for qemu-devel@nongnu.org; Wed, 05 Aug 2015 12:57:18 -0400
References: <1438337876-13558-1-git-send-email-berrange@redhat.com>
	<55BB6EED.2010805@redhat.com> <55BBB755.1060503@weilnetz.de>
	<20150805095246.GB16246@redhat.com> <55C1ED97.2080005@weilnetz.de>
	<E0CEE935-6984-4758-9DBE-BB1737CAD6D6@livius.net>
From: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <55C2405B.4050008@redhat.com>
Date: Wed, 5 Aug 2015 18:56:59 +0200
MIME-Version: 1.0
In-Reply-To: <E0CEE935-6984-4758-9DBE-BB1737CAD6D6@livius.net>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] QEMU 2.4 for Windows - current status
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: Liviu Ionescu <ilg@livius.net>, Stefan Weil <sw@weilnetz.de>
Cc: qemu-devel@nongnu.org



On 05/08/2015 18:51, Liviu Ionescu wrote:
> 
>> On 05 Aug 2015, at 14:03, Stefan Weil <sw@weilnetz.de> wrote:
>>
>> Fix sigsetjmp for w64
>> http://repo.or.cz/w/qemu/ar7.git/commit/8fa9c07c9a33174905e67589bea6be3e278712cb
> 
> 
> I tried to apply your patch to my branch and I got:
> 
> Running QEMU make install...
>   CC    gnuarmeclipse-softmmu/cpu-exec.o
> /Host/Work/qemu/gnuarmeclipse-qemu.git/cpu-exec.c:37:0: warning: "sigsetjmp" redefined
>  #define sigsetjmp(env, savesigs) _setjmp(env, NULL)
>  ^
> In file included from /Host/Work/qemu/gnuarmeclipse-qemu.git/include/qemu-common.h:47:0,
>                  from /Host/Work/qemu/gnuarmeclipse-qemu.git/target-arm/cpu.h:39,
>                  from /Host/Work/qemu/gnuarmeclipse-qemu.git/cpu-exec.c:20:
> /Host/Work/qemu/gnuarmeclipse-qemu.git/include/sysemu/os-win32.h:72:0: note: this is the location of the previous definition
>  #define sigsetjmp(env, savemask) setjmp(env)
>  ^
> 
> 
> I did not check the latest version in the repository (waiting for
> 2.4), but could you verify, maybe a better location for your patch
> would be in os-win32.h?

os-win32.h has the following already:

#if defined(_WIN64)
# undef setjmp
# define setjmp(env) _setjmp(env, NULL)
#endif
#define sigjmp_buf jmp_buf
#define sigsetjmp(env, savemask) setjmp(env)


And Stefan's patch has this in cpu-exec.c:

#if defined(_WIN64)
#define sigsetjmp(env, savesigs) _setjmp(env, NULL)
#endif

The above should not be necessary if the definition of sigsetjmp is
already picked up from os-win32.h.

Since os-win32.h is usually included through qemu-common.h, my guess was
that cpu-exec.c was missing an inclusion of qemu-common.h.  However, all
target-*/cpu.h files include qemu-common.h, so I am not sure why things
break for Stefan...

Paolo