[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] qemu-barrier: Fix compilation on i386 hosts
From: |
Blue Swirl |
Subject: |
Re: [Qemu-devel] [PATCH] qemu-barrier: Fix compilation on i386 hosts |
Date: |
Sun, 7 Oct 2012 16:10:41 +0000 |
On Sat, Oct 6, 2012 at 10:46 AM, Stefan Weil <address@hidden> 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 <address@hidden>
> ---
>
> 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
>
>