Re: [Qemu-devel] [PATCH] Include setjmp.h in qemu/osdep.h (bug fix for w64)

[Andrew Baumann]

> From: Stefan Weil [mailto:s...@weilnetz.de]
> Sent: Friday, 11 March 2016 10:32 PM
> 
> setjmp must be declared before sysemu/os-win32.h
> because it is redefined there for 64 bit Windows.
> 
> Signed-off-by: Stefan Weil 
> ---

Tested-by: Andrew Baumann 

Thanks Stefan,
Andrew

Re: [Qemu-devel] [PATCH] Include setjmp.h in qemu/osdep.h (bug fix for w64)

[Stefan Weil]

Am 14.03.2016 um 08:02 schrieb Markus Armbruster:
> Stefan Weil  writes:
[...]
>> diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
>> index 4538fdc..5bb374c 100644
>> --- a/include/qemu/osdep.h
>> +++ b/include/qemu/osdep.h
>> @@ -76,6 +76,9 @@ extern int daemon(int, int);
>>  #include 
>>  #include 
>>  #include 
>> +/* setjmp must be declared before sysemu/os-win32.h
>> + * because it is redefined there. */
>> +#include 
>>  #include 
>>  
>>  #ifdef __OpenBSD__
> 
> Please add  to scripts/clean-includes.
> 

Thanks for this hint. I had already prepared a patch
which removes the now unneeded setjmp.h include statements
and added the modification for scripts/clean-includes
to that patch now.

Stefan



signature.asc
Description: OpenPGP digital signature

Re: [Qemu-devel] [PATCH] Include setjmp.h in qemu/osdep.h (bug fix for w64)

[Markus Armbruster]

Stefan Weil  writes:

> setjmp must be declared before sysemu/os-win32.h
> because it is redefined there for 64 bit Windows.
>
> Signed-off-by: Stefan Weil 
> ---
>
> This patch superseeds my previous patch
> "Use special code for sigsetjmp only in cpu-exec.c".
>
> It is needed for QEMU on 64 bit Windows to get the
> correct definition of setjmp (without stack unwinding).
>
> Regards,
> Stefan
>
>
>  include/qemu/osdep.h | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
> index 4538fdc..5bb374c 100644
> --- a/include/qemu/osdep.h
> +++ b/include/qemu/osdep.h
> @@ -76,6 +76,9 @@ extern int daemon(int, int);
>  #include 
>  #include 
>  #include 
> +/* setjmp must be declared before sysemu/os-win32.h
> + * because it is redefined there. */
> +#include 
>  #include 
>  
>  #ifdef __OpenBSD__

Please add  to scripts/clean-includes.

Re: [Qemu-devel] [PATCH] Include setjmp.h in qemu/osdep.h (bug fix for w64)

[Richard Henderson]

On 03/11/2016 10:31 PM, Stefan Weil wrote:

setjmp must be declared before sysemu/os-win32.h
because it is redefined there for 64 bit Windows.

Signed-off-by: Stefan Weil


Reviewed-by: Richard Henderson  


r~

[Qemu-devel] [PATCH] Include setjmp.h in qemu/osdep.h (bug fix for w64)

[Stefan Weil]

setjmp must be declared before sysemu/os-win32.h
because it is redefined there for 64 bit Windows.

Signed-off-by: Stefan Weil 
---

This patch superseeds my previous patch
"Use special code for sigsetjmp only in cpu-exec.c".

It is needed for QEMU on 64 bit Windows to get the
correct definition of setjmp (without stack unwinding).

Regards,
Stefan


 include/qemu/osdep.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index 4538fdc..5bb374c 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -76,6 +76,9 @@ extern int daemon(int, int);
 #include 
 #include 
 #include 
+/* setjmp must be declared before sysemu/os-win32.h
+ * because it is redefined there. */
+#include 
 #include 
 
 #ifdef __OpenBSD__
-- 
2.1.4