* [Qemu-devel] [PATCH] Include setjmp.h in qemu/osdep.h (bug fix for w64)
@ 2016-03-12 6:31 Stefan Weil
2016-03-12 20:54 ` Richard Henderson
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Stefan Weil @ 2016-03-12 6:31 UTC (permalink / raw)
To: QEMU Developer, Andrew Baumann
Cc: Paolo Bonzini, Stefan Weil, Richard Henderson, Peter Crosthwaite
setjmp must be declared before sysemu/os-win32.h
because it is redefined there for 64 bit Windows.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
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 <sys/stat.h>
#include <sys/time.h>
#include <assert.h>
+/* setjmp must be declared before sysemu/os-win32.h
+ * because it is redefined there. */
+#include <setjmp.h>
#include <signal.h>
#ifdef __OpenBSD__
--
2.1.4
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [Qemu-devel] [PATCH] Include setjmp.h in qemu/osdep.h (bug fix for w64)
2016-03-12 6:31 [Qemu-devel] [PATCH] Include setjmp.h in qemu/osdep.h (bug fix for w64) Stefan Weil
@ 2016-03-12 20:54 ` Richard Henderson
2016-03-14 7:02 ` Markus Armbruster
2016-03-14 18:21 ` Andrew Baumann
2 siblings, 0 replies; 5+ messages in thread
From: Richard Henderson @ 2016-03-12 20:54 UTC (permalink / raw)
To: Stefan Weil, QEMU Developer, Andrew Baumann
Cc: Paolo Bonzini, Peter Crosthwaite
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<sw@weilnetz.de>
Reviewed-by: Richard Henderson <rth@twiddle.net>
r~
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] Include setjmp.h in qemu/osdep.h (bug fix for w64)
2016-03-12 6:31 [Qemu-devel] [PATCH] Include setjmp.h in qemu/osdep.h (bug fix for w64) Stefan Weil
2016-03-12 20:54 ` Richard Henderson
@ 2016-03-14 7:02 ` Markus Armbruster
2016-03-14 18:19 ` Stefan Weil
2016-03-14 18:21 ` Andrew Baumann
2 siblings, 1 reply; 5+ messages in thread
From: Markus Armbruster @ 2016-03-14 7:02 UTC (permalink / raw)
To: Stefan Weil
Cc: Peter Maydell, Peter Crosthwaite, QEMU Developer, Andrew Baumann,
Paolo Bonzini, Richard Henderson
Stefan Weil <sw@weilnetz.de> writes:
> setjmp must be declared before sysemu/os-win32.h
> because it is redefined there for 64 bit Windows.
>
> Signed-off-by: Stefan Weil <sw@weilnetz.de>
> ---
>
> 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 <sys/stat.h>
> #include <sys/time.h>
> #include <assert.h>
> +/* setjmp must be declared before sysemu/os-win32.h
> + * because it is redefined there. */
> +#include <setjmp.h>
> #include <signal.h>
>
> #ifdef __OpenBSD__
Please add <setjmp.h> to scripts/clean-includes.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] Include setjmp.h in qemu/osdep.h (bug fix for w64)
2016-03-14 7:02 ` Markus Armbruster
@ 2016-03-14 18:19 ` Stefan Weil
0 siblings, 0 replies; 5+ messages in thread
From: Stefan Weil @ 2016-03-14 18:19 UTC (permalink / raw)
To: Markus Armbruster
Cc: Peter Maydell, Peter Crosthwaite, QEMU Developer, Andrew Baumann,
Paolo Bonzini, Richard Henderson
[-- Attachment #1: Type: text/plain, Size: 827 bytes --]
Am 14.03.2016 um 08:02 schrieb Markus Armbruster:
> Stefan Weil <sw@weilnetz.de> 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 <sys/stat.h>
>> #include <sys/time.h>
>> #include <assert.h>
>> +/* setjmp must be declared before sysemu/os-win32.h
>> + * because it is redefined there. */
>> +#include <setjmp.h>
>> #include <signal.h>
>>
>> #ifdef __OpenBSD__
>
> Please add <setjmp.h> 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] [PATCH] Include setjmp.h in qemu/osdep.h (bug fix for w64)
2016-03-12 6:31 [Qemu-devel] [PATCH] Include setjmp.h in qemu/osdep.h (bug fix for w64) Stefan Weil
2016-03-12 20:54 ` Richard Henderson
2016-03-14 7:02 ` Markus Armbruster
@ 2016-03-14 18:21 ` Andrew Baumann
2 siblings, 0 replies; 5+ messages in thread
From: Andrew Baumann @ 2016-03-14 18:21 UTC (permalink / raw)
To: Stefan Weil, QEMU Developer
Cc: Paolo Bonzini, Richard Henderson, Peter Crosthwaite
> From: Stefan Weil [mailto:sw@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 <sw@weilnetz.de>
> ---
Tested-by: Andrew Baumann <Andrew.Baumann@microsoft.com>
Thanks Stefan,
Andrew
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2016-03-14 18:21 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-12 6:31 [Qemu-devel] [PATCH] Include setjmp.h in qemu/osdep.h (bug fix for w64) Stefan Weil
2016-03-12 20:54 ` Richard Henderson
2016-03-14 7:02 ` Markus Armbruster
2016-03-14 18:19 ` Stefan Weil
2016-03-14 18:21 ` Andrew Baumann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).