| Submitter | Stefan Weil |
|---|---|
| Date | Oct. 6, 2012, 10:46 a.m. |
| Message ID | <1349520375-9853-1-git-send-email-sw@weilnetz.de> |
| Download | mbox | patch |
| Permalink | /patch/189678/ |
| State | Accepted |
| Headers | show |
Comments
On Sat, Oct 06, 2012 at 12:46:15PM +0200, Stefan Weil wrote: > Commit 610b823ef66b993660f1ab1447a769f190e4f3b3 uses QEMU_GNUC_PREREQ > on i386 hosts. > > That macro is defined in qemu-common.h which is not always included > before qemu-barrier.h, so compilation on i386 hosts was broken. > > Signed-off-by: Stefan Weil <sw@weilnetz.de> > --- > > This patch fixes broken compilation for i386 hosts which > was reported by the buildbot: > > http://buildbot.b1-systems.de/qemu/builders/default_mingw32/builds/396 > > Regards > > Stefan Weil > > qemu-barrier.h | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/qemu-barrier.h b/qemu-barrier.h > index 16f0942..1de914e 100644 > --- a/qemu-barrier.h > +++ b/qemu-barrier.h > @@ -6,6 +6,8 @@ > > #if defined(__i386__) > > +#include "qemu-common.h" /* QEMU_GNUC_PREREQ */ > + > /* > * Because of the strongly ordered x86 storage model, wmb() and rmb() are nops > * on x86(well, a compiler barrier only). Well, at least as long as > -- > 1.7.10 > Thanks, applied.
On Sat, Oct 6, 2012 at 10:46 AM, Stefan Weil <sw@weilnetz.de> wrote: > Commit 610b823ef66b993660f1ab1447a769f190e4f3b3 uses QEMU_GNUC_PREREQ > on i386 hosts. > > That macro is defined in qemu-common.h which is not always included > before qemu-barrier.h, so compilation on i386 hosts was broken. This broke sparc-softmmu build on i386: CC sparc-softmmu/hw/vhost_net.o In file included from /src/qemu/target-sparc/cpu.h:28, from /src/qemu/qemu-common.h:128, from /src/qemu/qemu-barrier.h:9, from /src/qemu/qemu-queue.h:81, from /src/qemu/net.h:4, from /src/qemu/hw/vhost_net.c:16: /src/qemu/cpu-defs.h:144: error: expected specifier-qualifier-list before 'QTAILQ_ENTRY' /src/qemu/cpu-defs.h:151: error: expected specifier-qualifier-list before 'QTAILQ_ENTRY' I think the correct fix is to include compiler.h instead. > > Signed-off-by: Stefan Weil <sw@weilnetz.de> > --- > > This patch fixes broken compilation for i386 hosts which > was reported by the buildbot: > > http://buildbot.b1-systems.de/qemu/builders/default_mingw32/builds/396 > > Regards > > Stefan Weil > > qemu-barrier.h | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/qemu-barrier.h b/qemu-barrier.h > index 16f0942..1de914e 100644 > --- a/qemu-barrier.h > +++ b/qemu-barrier.h > @@ -6,6 +6,8 @@ > > #if defined(__i386__) > > +#include "qemu-common.h" /* QEMU_GNUC_PREREQ */ > + > /* > * Because of the strongly ordered x86 storage model, wmb() and rmb() are nops > * on x86(well, a compiler barrier only). Well, at least as long as > -- > 1.7.10 > >
Patch
diff --git a/qemu-barrier.h b/qemu-barrier.h index 16f0942..1de914e 100644 --- a/qemu-barrier.h +++ b/qemu-barrier.h @@ -6,6 +6,8 @@ #if defined(__i386__) +#include "qemu-common.h" /* QEMU_GNUC_PREREQ */ + /* * Because of the strongly ordered x86 storage model, wmb() and rmb() are nops * on x86(well, a compiler barrier only). Well, at least as long as
Commit 610b823ef66b993660f1ab1447a769f190e4f3b3 uses QEMU_GNUC_PREREQ on i386 hosts. That macro is defined in qemu-common.h which is not always included before qemu-barrier.h, so compilation on i386 hosts was broken. Signed-off-by: Stefan Weil <sw@weilnetz.de> --- This patch fixes broken compilation for i386 hosts which was reported by the buildbot: http://buildbot.b1-systems.de/qemu/builders/default_mingw32/builds/396 Regards Stefan Weil qemu-barrier.h | 2 ++ 1 file changed, 2 insertions(+)