All of lore.kernel.org
 help / color / mirror / Atom feed
* Re: [Qemu-devel] buildbot failure in qemu on disable_kvm_x86_64_debian_5_0
  2011-07-04  0:04 [Qemu-devel] buildbot failure in qemu on disable_kvm_x86_64_debian_5_0 qemu
@ 2011-07-03 23:47 ` Alexander Graf
  2011-07-04  4:23   ` Stefan Hajnoczi
  0 siblings, 1 reply; 13+ messages in thread
From: Alexander Graf @ 2011-07-03 23:47 UTC (permalink / raw)
  To: qemu; +Cc: Stefan Hajnoczi, Daniel Gollub, qemu-devel@nongnu.org Developers


On 04.07.2011, at 02:04, qemu@buildbot.b1-systems.de wrote:

> The Buildbot has detected a new failure on builder disable_kvm_x86_64_debian_5_0 while building qemu.
> Full details are available at:
> http://buildbot.b1-systems.de/qemu/builders/disable_kvm_x86_64_debian_5_0/builds/148
> 
> Buildbot URL: http://buildbot.b1-systems.de/qemu/
> 
> Buildslave for this Build: b1_qemu_1
> 
> Build Reason: The Nightly scheduler named 'nightly_disable_kvm' triggered this build
> Build Source Stamp: [branch master] HEAD
> Blamelist: 
> 
> BUILD FAILED: failed compile

In file included from /usr/include/png.h:438,
                 from ui/vnc-enc-tight.c:40:
/usr/include/pngconf.h:326: error: expected '=', ',', ';', 'asm' or '__attribute__' before '.' token
/usr/include/pngconf.h:327: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'include'
make: *** [ui/vnc-enc-tight.o] Error 1

program finished with exit code 2


Not sure what exactly is missing, but the last change in that code was from Stefan Weil (2fb0c09f4ff036f68474277ed4edc036f6529de8).

Alex

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [Qemu-devel] buildbot failure in qemu on disable_kvm_x86_64_debian_5_0
@ 2011-07-04  0:04 qemu
  2011-07-03 23:47 ` Alexander Graf
  0 siblings, 1 reply; 13+ messages in thread
From: qemu @ 2011-07-04  0:04 UTC (permalink / raw)
  To: agraf, gollub, qemu-devel

The Buildbot has detected a new failure on builder disable_kvm_x86_64_debian_5_0 while building qemu.
Full details are available at:
 http://buildbot.b1-systems.de/qemu/builders/disable_kvm_x86_64_debian_5_0/builds/148

Buildbot URL: http://buildbot.b1-systems.de/qemu/

Buildslave for this Build: b1_qemu_1

Build Reason: The Nightly scheduler named 'nightly_disable_kvm' triggered this build
Build Source Stamp: [branch master] HEAD
Blamelist: 

BUILD FAILED: failed compile

sincerely,
 -The Buildbot


^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [Qemu-devel] buildbot failure in qemu on disable_kvm_x86_64_debian_5_0
  2011-07-03 23:47 ` Alexander Graf
@ 2011-07-04  4:23   ` Stefan Hajnoczi
  2011-07-04  5:41     ` Daniel Gollub
  2011-07-04  5:51     ` Stefan Weil
  0 siblings, 2 replies; 13+ messages in thread
From: Stefan Hajnoczi @ 2011-07-04  4:23 UTC (permalink / raw)
  To: Daniel Gollub; +Cc: qemu, Alexander Graf, qemu-devel@nongnu.org Developers

On Mon, Jul 4, 2011 at 12:47 AM, Alexander Graf <agraf@suse.de> wrote:
>
> On 04.07.2011, at 02:04, qemu@buildbot.b1-systems.de wrote:
>
>> The Buildbot has detected a new failure on builder disable_kvm_x86_64_debian_5_0 while building qemu.
>> Full details are available at:
>> http://buildbot.b1-systems.de/qemu/builders/disable_kvm_x86_64_debian_5_0/builds/148
>>
>> Buildbot URL: http://buildbot.b1-systems.de/qemu/
>>
>> Buildslave for this Build: b1_qemu_1
>>
>> Build Reason: The Nightly scheduler named 'nightly_disable_kvm' triggered this build
>> Build Source Stamp: [branch master] HEAD
>> Blamelist:
>>
>> BUILD FAILED: failed compile
>
> In file included from /usr/include/png.h:438,
>                 from ui/vnc-enc-tight.c:40:
> /usr/include/pngconf.h:326: error: expected '=', ',', ';', 'asm' or '__attribute__' before '.' token
> /usr/include/pngconf.h:327: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'include'
> make: *** [ui/vnc-enc-tight.o] Error 1
>
> program finished with exit code 2
>
>
> Not sure what exactly is missing, but the last change in that code was from Stefan Weil (2fb0c09f4ff036f68474277ed4edc036f6529de8).

Daniel,
Would it be possible to post the contents of /usr/include/pngconf.h
from b1_qemu_1?  I checked my local copy and I don't understand these
compiler errors.  Perhaps you have a different version of the file.

Thanks,
Stefan

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [Qemu-devel] buildbot failure in qemu on disable_kvm_x86_64_debian_5_0
  2011-07-04  4:23   ` Stefan Hajnoczi
@ 2011-07-04  5:41     ` Daniel Gollub
  2011-07-04  6:08       ` Stefan Hajnoczi
  2011-07-04  5:51     ` Stefan Weil
  1 sibling, 1 reply; 13+ messages in thread
From: Daniel Gollub @ 2011-07-04  5:41 UTC (permalink / raw)
  To: Stefan Hajnoczi; +Cc: qemu, Alexander Graf, qemu-devel@nongnu.org Developers

[-- Attachment #1: Type: Text/Plain, Size: 1872 bytes --]

On Monday, July 04, 2011 06:23:41 am Stefan Hajnoczi wrote:
> >> BUILD FAILED: failed compile
> > 
> > In file included from /usr/include/png.h:438,
> >                 from ui/vnc-enc-tight.c:40:
> > /usr/include/pngconf.h:326: error: expected '=', ',', ';', 'asm' or
> > '__attribute__' before '.' token /usr/include/pngconf.h:327: error:
> > expected '=', ',', ';', 'asm' or '__attribute__' before 'include' make:
> > *** [ui/vnc-enc-tight.o] Error 1
> > 
> > program finished with exit code 2
> > 
> > 
> > Not sure what exactly is missing, but the last change in that code was
> > from Stefan Weil (2fb0c09f4ff036f68474277ed4edc036f6529de8).
> 
> Daniel,
> Would it be possible to post the contents of /usr/include/pngconf.h
> from b1_qemu_1?  I checked my local copy and I don't understand these
> compiler errors.  Perhaps you have a different version of the file.

Good catch. 

I readded my Debian 5 x86_64 buildslave to the qemu continous build yesterday. 
Thats the reason of this "regression", which very likely isn't one ...

All the other build failures from last night have the same root cause i guess. 
Because the run for the first time on b1_qemu_1 since a while ...

Stefan, which distro is your slave currently running on?
I guess we should sync up the buildbot factories so we run the same distro. Or 
create a new buildbot factory for Debian Lenny and more recent Distro ...


With regards to pngconf.h:

http://people.b1-systems.de/~gollub/pngconf.h

b1_qemu_1 is still runing Debian 5 (Lenny):
libpng12-dev   1.2.27-2+lenny

Best Regards,
Daniel

-- 
Daniel Gollub
Linux Consultant & Developer
Tel.: +49-160 47 73 970 
Mail: gollub@b1-systems.de

B1 Systems GmbH
Osterfeldstraße 7 / 85088 Vohburg / http://www.b1-systems.de
GF: Ralph Dehner / Unternehmenssitz: Vohburg / AG: Ingolstadt,HRB 3537

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [Qemu-devel] buildbot failure in qemu on disable_kvm_x86_64_debian_5_0
  2011-07-04  4:23   ` Stefan Hajnoczi
  2011-07-04  5:41     ` Daniel Gollub
@ 2011-07-04  5:51     ` Stefan Weil
  2011-07-04  9:21       ` Alexander Graf
  1 sibling, 1 reply; 13+ messages in thread
From: Stefan Weil @ 2011-07-04  5:51 UTC (permalink / raw)
  To: Daniel Gollub
  Cc: Stefan Hajnoczi, Alexander Graf, qemu-devel@nongnu.org Developers

Am 04.07.2011 06:23, schrieb Stefan Hajnoczi:
> On Mon, Jul 4, 2011 at 12:47 AM, Alexander Graf <agraf@suse.de> wrote:
>>
>> On 04.07.2011, at 02:04, qemu@buildbot.b1-systems.de wrote:
>>
>>> The Buildbot has detected a new failure on builder 
>>> disable_kvm_x86_64_debian_5_0 while building qemu.
>>> Full details are available at:
>>> http://buildbot.b1-systems.de/qemu/builders/disable_kvm_x86_64_debian_5_0/builds/148
>>>
>>> Buildbot URL: http://buildbot.b1-systems.de/qemu/
>>>
>>> Buildslave for this Build: b1_qemu_1
>>>
>>> Build Reason: The Nightly scheduler named 'nightly_disable_kvm' 
>>> triggered this build
>>> Build Source Stamp: [branch master] HEAD
>>> Blamelist:
>>>
>>> BUILD FAILED: failed compile
>>
>> In file included from /usr/include/png.h:438,
>>                 from ui/vnc-enc-tight.c:40:
>> /usr/include/pngconf.h:326: error: expected '=', ',', ';', 'asm' or 
>> '__attribute__' before '.' token
>> /usr/include/pngconf.h:327: error: expected '=', ',', ';', 'asm' or 
>> '__attribute__' before 'include'
>> make: *** [ui/vnc-enc-tight.o] Error 1
>>
>> program finished with exit code 2
>>
>>
>> Not sure what exactly is missing, but the last change in that code 
>> was from Stefan Weil (2fb0c09f4ff036f68474277ed4edc036f6529de8).
>
> Daniel,
> Would it be possible to post the contents of /usr/include/pngconf.h
> from b1_qemu_1? I checked my local copy and I don't understand these
> compiler errors. Perhaps you have a different version of the file.
>
> Thanks,
> Stefan

The compiler errors come again from the setjmp check in pngconf.h:

            __pngconf.h__ in libpng already includes setjmp.h;
            __dont__ include it again.;

The buildbot runs Debian Lenny which includes an old version of libpng.
That version does not use PNG_SKIP_SETJMP_CHECK to skip the setjmp check.
Defining PNG_SETJMP_NOT_SUPPORTED might help with this
version, but I still have to test that.

Updating the buildbot to Debian Squeeze would also work.

Cheers,
Stefan

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [Qemu-devel] buildbot failure in qemu on disable_kvm_x86_64_debian_5_0
  2011-07-04  5:41     ` Daniel Gollub
@ 2011-07-04  6:08       ` Stefan Hajnoczi
  0 siblings, 0 replies; 13+ messages in thread
From: Stefan Hajnoczi @ 2011-07-04  6:08 UTC (permalink / raw)
  To: Daniel Gollub; +Cc: qemu, Alexander Graf, qemu-devel@nongnu.org Developers

On Mon, Jul 4, 2011 at 6:41 AM, Daniel Gollub <gollub@b1-systems.de> wrote:
> On Monday, July 04, 2011 06:23:41 am Stefan Hajnoczi wrote:
>> >> BUILD FAILED: failed compile
>> >
>> > In file included from /usr/include/png.h:438,
>> >                 from ui/vnc-enc-tight.c:40:
>> > /usr/include/pngconf.h:326: error: expected '=', ',', ';', 'asm' or
>> > '__attribute__' before '.' token /usr/include/pngconf.h:327: error:
>> > expected '=', ',', ';', 'asm' or '__attribute__' before 'include' make:
>> > *** [ui/vnc-enc-tight.o] Error 1
>> >
>> > program finished with exit code 2
>> >
>> >
>> > Not sure what exactly is missing, but the last change in that code was
>> > from Stefan Weil (2fb0c09f4ff036f68474277ed4edc036f6529de8).
>>
>> Daniel,
>> Would it be possible to post the contents of /usr/include/pngconf.h
>> from b1_qemu_1?  I checked my local copy and I don't understand these
>> compiler errors.  Perhaps you have a different version of the file.
>
> Good catch.
>
> I readded my Debian 5 x86_64 buildslave to the qemu continous build yesterday.
> Thats the reason of this "regression", which very likely isn't one ...
>
> All the other build failures from last night have the same root cause i guess.
> Because the run for the first time on b1_qemu_1 since a while ...
>
> Stefan, which distro is your slave currently running on?

yuzuki is running Debian squeeze x86_64.

Stefan

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [Qemu-devel] buildbot failure in qemu on disable_kvm_x86_64_debian_5_0
  2011-07-04  5:51     ` Stefan Weil
@ 2011-07-04  9:21       ` Alexander Graf
  2011-07-04 16:33         ` Stefan Weil
  0 siblings, 1 reply; 13+ messages in thread
From: Alexander Graf @ 2011-07-04  9:21 UTC (permalink / raw)
  To: Stefan Weil
  Cc: Stefan Hajnoczi, Daniel Gollub, qemu-devel@nongnu.org Developers


On 04.07.2011, at 07:51, Stefan Weil wrote:

> Am 04.07.2011 06:23, schrieb Stefan Hajnoczi:
>> On Mon, Jul 4, 2011 at 12:47 AM, Alexander Graf <agraf@suse.de> wrote:
>>> 
>>> On 04.07.2011, at 02:04, qemu@buildbot.b1-systems.de wrote:
>>> 
>>>> The Buildbot has detected a new failure on builder disable_kvm_x86_64_debian_5_0 while building qemu.
>>>> Full details are available at:
>>>> http://buildbot.b1-systems.de/qemu/builders/disable_kvm_x86_64_debian_5_0/builds/148
>>>> 
>>>> Buildbot URL: http://buildbot.b1-systems.de/qemu/
>>>> 
>>>> Buildslave for this Build: b1_qemu_1
>>>> 
>>>> Build Reason: The Nightly scheduler named 'nightly_disable_kvm' triggered this build
>>>> Build Source Stamp: [branch master] HEAD
>>>> Blamelist:
>>>> 
>>>> BUILD FAILED: failed compile
>>> 
>>> In file included from /usr/include/png.h:438,
>>>                from ui/vnc-enc-tight.c:40:
>>> /usr/include/pngconf.h:326: error: expected '=', ',', ';', 'asm' or '__attribute__' before '.' token
>>> /usr/include/pngconf.h:327: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'include'
>>> make: *** [ui/vnc-enc-tight.o] Error 1
>>> 
>>> program finished with exit code 2
>>> 
>>> 
>>> Not sure what exactly is missing, but the last change in that code was from Stefan Weil (2fb0c09f4ff036f68474277ed4edc036f6529de8).
>> 
>> Daniel,
>> Would it be possible to post the contents of /usr/include/pngconf.h
>> from b1_qemu_1? I checked my local copy and I don't understand these
>> compiler errors. Perhaps you have a different version of the file.
>> 
>> Thanks,
>> Stefan
> 
> The compiler errors come again from the setjmp check in pngconf.h:
> 
>           __pngconf.h__ in libpng already includes setjmp.h;
>           __dont__ include it again.;
> 
> The buildbot runs Debian Lenny which includes an old version of libpng.
> That version does not use PNG_SKIP_SETJMP_CHECK to skip the setjmp check.
> Defining PNG_SETJMP_NOT_SUPPORTED might help with this
> version, but I still have to test that.
> 
> Updating the buildbot to Debian Squeeze would also work.

So it's a real bug and a good thing the buildbot is running on Lenny. Maybe we should add the define and #include setjmp.h to configure, so at least that one fails when compilation wouldn't work either?


Alex

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [Qemu-devel] buildbot failure in qemu on disable_kvm_x86_64_debian_5_0
  2011-07-04  9:21       ` Alexander Graf
@ 2011-07-04 16:33         ` Stefan Weil
  2011-07-04 18:44           ` [Qemu-devel] [PATCH] Remove unneeded setjmp.h (fix compilation with on Debian "lenny") Stefan Weil
  0 siblings, 1 reply; 13+ messages in thread
From: Stefan Weil @ 2011-07-04 16:33 UTC (permalink / raw)
  To: qemu-devel@nongnu.org Developers
  Cc: Stefan Hajnoczi, Daniel Gollub, Alexander Graf

Am 04.07.2011 11:21, schrieb Alexander Graf:
>
> On 04.07.2011, at 07:51, Stefan Weil wrote:
>
>> Am 04.07.2011 06:23, schrieb Stefan Hajnoczi:
>>> On Mon, Jul 4, 2011 at 12:47 AM, Alexander Graf <agraf@suse.de> wrote:
>>>>
>>>> On 04.07.2011, at 02:04, qemu@buildbot.b1-systems.de wrote:
>>>>
>>>>> The Buildbot has detected a new failure on builder 
>>>>> disable_kvm_x86_64_debian_5_0 while building qemu.
>>>>> Full details are available at:
>>>>> http://buildbot.b1-systems.de/qemu/builders/disable_kvm_x86_64_debian_5_0/builds/148
>>>>>
>>>>> Buildbot URL: http://buildbot.b1-systems.de/qemu/
>>>>>
>>>>> Buildslave for this Build: b1_qemu_1
>>>>>
>>>>> Build Reason: The Nightly scheduler named 'nightly_disable_kvm' 
>>>>> triggered this build
>>>>> Build Source Stamp: [branch master] HEAD
>>>>> Blamelist:
>>>>>
>>>>> BUILD FAILED: failed compile
>>>>
>>>> In file included from /usr/include/png.h:438,
>>>> from ui/vnc-enc-tight.c:40:
>>>> /usr/include/pngconf.h:326: error: expected '=', ',', ';', 'asm' or 
>>>> '__attribute__' before '.' token
>>>> /usr/include/pngconf.h:327: error: expected '=', ',', ';', 'asm' or 
>>>> '__attribute__' before 'include'
>>>> make: *** [ui/vnc-enc-tight.o] Error 1
>>>>
>>>> program finished with exit code 2
>>>>
>>>>
>>>> Not sure what exactly is missing, but the last change in that code 
>>>> was from Stefan Weil (2fb0c09f4ff036f68474277ed4edc036f6529de8).
>>>
>>> Daniel,
>>> Would it be possible to post the contents of /usr/include/pngconf.h
>>> from b1_qemu_1? I checked my local copy and I don't understand these
>>> compiler errors. Perhaps you have a different version of the file.
>>>
>>> Thanks,
>>> Stefan
>>
>> The compiler errors come again from the setjmp check in pngconf.h:
>>
>> __pngconf.h__ in libpng already includes setjmp.h;
>> __dont__ include it again.;
>>
>> The buildbot runs Debian Lenny which includes an old version of libpng.
>> That version does not use PNG_SKIP_SETJMP_CHECK to skip the setjmp check.
>> Defining PNG_SETJMP_NOT_SUPPORTED might help with this
>> version, but I still have to test that.
>>
>> Updating the buildbot to Debian Squeeze would also work.
>
> So it's a real bug and a good thing the buildbot is running on Lenny. 
> Maybe we should add the define and #include setjmp.h to configure, so 
> at least that one fails when compilation wouldn't work either?
>
>
> Alex

It's a real bug, or at least an incompatibility with libpng.
It can be fixed in several ways, for example these:

1 Don't use libpng because it restricts usage of setjmp.h
   and raises confusing compiler errors instead of a clear #error.
   Code which needs libpng would have to be removed.

2 Don't use libpng if it fails to accepts the current code
   (setjmp.h before png.h). This needs a small modification
   of the libpng check in configure.

3 Define PNG_SETJMP_NOT_SUPPORTED, so Debian Lenny's libpng
   works, too. Enhancing the libpng in check in configure
   would be reasonable to avoid more surprises with other
   variants of libpng.

4 Remove setjmp.h from qemu-common.h. I expected that I would
   have to add setjmp.h in some source files after this operation,
   but was surprised that this was not needed.

I suggest solution 4 because it is simple, and it also avoids
an unnecessary inclusion of setjmp.h in nearly all compiler
invocations. Optionally, commit 2fb0c09f4ff036f68474277ed4edc036f6529de8
can be reverted then to detect any use of setjmp.h before png.h.

Regards,
Stefan

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [Qemu-devel] [PATCH] Remove unneeded setjmp.h (fix compilation with on Debian "lenny")
  2011-07-04 16:33         ` Stefan Weil
@ 2011-07-04 18:44           ` Stefan Weil
  2011-07-04 18:51             ` Stefan Weil
  2011-07-04 18:52             ` [Qemu-devel] [PATCH v2] Remove unneeded setjmp.h (fix compilation " Stefan Weil
  0 siblings, 2 replies; 13+ messages in thread
From: Stefan Weil @ 2011-07-04 18:44 UTC (permalink / raw)
  To: qemu-devel

Some versions of png.h cannot be included after setjmp.h,
even when PNG_SKIP_SETJMP_CHECK was defined.

setjmp.h was included from qemu-common.h and is not needed there.
Removing the include statement fixes compilation of ui/vnc-enc-tight.c
with CONFIG_VNC_PNG defined.

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
 qemu-common.h |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/qemu-common.h b/qemu-common.h
index abd7a75..c2b79bd 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -117,7 +117,6 @@ static inline char *realpath(const char *path, char *resolved_path)
 /* FIXME: Remove NEED_CPU_H.  */
 #ifndef NEED_CPU_H
 
-#include <setjmp.h>
 #include "osdep.h"
 #include "bswap.h"
 
-- 
1.7.2.5

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* Re: [Qemu-devel] [PATCH] Remove unneeded setjmp.h (fix compilation with on Debian "lenny")
  2011-07-04 18:44           ` [Qemu-devel] [PATCH] Remove unneeded setjmp.h (fix compilation with on Debian "lenny") Stefan Weil
@ 2011-07-04 18:51             ` Stefan Weil
  2011-07-04 18:52             ` [Qemu-devel] [PATCH v2] Remove unneeded setjmp.h (fix compilation " Stefan Weil
  1 sibling, 0 replies; 13+ messages in thread
From: Stefan Weil @ 2011-07-04 18:51 UTC (permalink / raw)
  To: QEMU Developers

Am 04.07.2011 20:44, schrieb Stefan Weil:
> Some versions of png.h cannot be included after setjmp.h,
> even when PNG_SKIP_SETJMP_CHECK was defined.
>
> setjmp.h was included from qemu-common.h and is not needed there.
> Removing the include statement fixes compilation of ui/vnc-enc-tight.c
> with CONFIG_VNC_PNG defined.
>
> Signed-off-by: Stefan Weil<weil@mail.berlios.de>
> ---

Sorry, I noticed that the subject is not correct ("with on")
after I had sent the patch. Please use patch v2.

Stefan

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [Qemu-devel] [PATCH v2] Remove unneeded setjmp.h (fix compilation on Debian "lenny")
  2011-07-04 18:44           ` [Qemu-devel] [PATCH] Remove unneeded setjmp.h (fix compilation with on Debian "lenny") Stefan Weil
  2011-07-04 18:51             ` Stefan Weil
@ 2011-07-04 18:52             ` Stefan Weil
  2011-07-04 21:02               ` Peter Maydell
  2011-07-12 21:28               ` Blue Swirl
  1 sibling, 2 replies; 13+ messages in thread
From: Stefan Weil @ 2011-07-04 18:52 UTC (permalink / raw)
  To: qemu-devel

Some versions of png.h cannot be included after setjmp.h,
even when PNG_SKIP_SETJMP_CHECK was defined.

setjmp.h was included from qemu-common.h and is not needed there.
Removing the include statement fixes compilation of ui/vnc-enc-tight.c
with CONFIG_VNC_PNG defined.

Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
 qemu-common.h |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/qemu-common.h b/qemu-common.h
index abd7a75..c2b79bd 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -117,7 +117,6 @@ static inline char *realpath(const char *path, char *resolved_path)
 /* FIXME: Remove NEED_CPU_H.  */
 #ifndef NEED_CPU_H
 
-#include <setjmp.h>
 #include "osdep.h"
 #include "bswap.h"
 
-- 
1.7.2.5

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* Re: [Qemu-devel] [PATCH v2] Remove unneeded setjmp.h (fix compilation on Debian "lenny")
  2011-07-04 18:52             ` [Qemu-devel] [PATCH v2] Remove unneeded setjmp.h (fix compilation " Stefan Weil
@ 2011-07-04 21:02               ` Peter Maydell
  2011-07-12 21:28               ` Blue Swirl
  1 sibling, 0 replies; 13+ messages in thread
From: Peter Maydell @ 2011-07-04 21:02 UTC (permalink / raw)
  To: Stefan Weil; +Cc: qemu-devel

On 4 July 2011 19:52, Stefan Weil <weil@mail.berlios.de> wrote:
> Some versions of png.h cannot be included after setjmp.h,
> even when PNG_SKIP_SETJMP_CHECK was defined.
>
> setjmp.h was included from qemu-common.h and is not needed there.
> Removing the include statement fixes compilation of ui/vnc-enc-tight.c
> with CONFIG_VNC_PNG defined.

This isn't the only unnecessary include of setjmp.h, incidentally.
The includes in target-alpha/cpu.h and target-ppc/cpu.h could
also be removed (cpu-defs.h includes setjmp.h). That would also
make those targets consistent with all the rest (which don't include
setjmp), so it seems worth the minor cleanup. I'll send a patch...

-- PMM

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [Qemu-devel] [PATCH v2] Remove unneeded setjmp.h (fix compilation on Debian "lenny")
  2011-07-04 18:52             ` [Qemu-devel] [PATCH v2] Remove unneeded setjmp.h (fix compilation " Stefan Weil
  2011-07-04 21:02               ` Peter Maydell
@ 2011-07-12 21:28               ` Blue Swirl
  1 sibling, 0 replies; 13+ messages in thread
From: Blue Swirl @ 2011-07-12 21:28 UTC (permalink / raw)
  To: Stefan Weil; +Cc: qemu-devel

Thanks, applied.

On Mon, Jul 4, 2011 at 9:52 PM, Stefan Weil <weil@mail.berlios.de> wrote:
> Some versions of png.h cannot be included after setjmp.h,
> even when PNG_SKIP_SETJMP_CHECK was defined.
>
> setjmp.h was included from qemu-common.h and is not needed there.
> Removing the include statement fixes compilation of ui/vnc-enc-tight.c
> with CONFIG_VNC_PNG defined.
>
> Signed-off-by: Stefan Weil <weil@mail.berlios.de>
> ---
>  qemu-common.h |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/qemu-common.h b/qemu-common.h
> index abd7a75..c2b79bd 100644
> --- a/qemu-common.h
> +++ b/qemu-common.h
> @@ -117,7 +117,6 @@ static inline char *realpath(const char *path, char *resolved_path)
>  /* FIXME: Remove NEED_CPU_H.  */
>  #ifndef NEED_CPU_H
>
> -#include <setjmp.h>
>  #include "osdep.h"
>  #include "bswap.h"
>
> --
> 1.7.2.5
>
>
>

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2011-07-12 21:29 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-07-04  0:04 [Qemu-devel] buildbot failure in qemu on disable_kvm_x86_64_debian_5_0 qemu
2011-07-03 23:47 ` Alexander Graf
2011-07-04  4:23   ` Stefan Hajnoczi
2011-07-04  5:41     ` Daniel Gollub
2011-07-04  6:08       ` Stefan Hajnoczi
2011-07-04  5:51     ` Stefan Weil
2011-07-04  9:21       ` Alexander Graf
2011-07-04 16:33         ` Stefan Weil
2011-07-04 18:44           ` [Qemu-devel] [PATCH] Remove unneeded setjmp.h (fix compilation with on Debian "lenny") Stefan Weil
2011-07-04 18:51             ` Stefan Weil
2011-07-04 18:52             ` [Qemu-devel] [PATCH v2] Remove unneeded setjmp.h (fix compilation " Stefan Weil
2011-07-04 21:02               ` Peter Maydell
2011-07-12 21:28               ` Blue Swirl

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.