From: Aurelien Jarno <aurelien@aurel32.net>
To: Blue Swirl <blauwirbel@gmail.com>
Cc: Stefan Weil <sw@weilnetz.de>,
Anthony Liguori <aliguori@us.ibm.com>,
qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH] qemu-barrier: Fix compilation on i386 hosts
Date: Sun, 7 Oct 2012 20:10:16 +0200 [thread overview]
Message-ID: <20121007181016.GD4055@ohm.aurel32.net> (raw)
In-Reply-To: <CAAu8pHv75MXZu9feSrFT+PfHf=Cq8o0Z67gP8K1FeY07jY5QSg@mail.gmail.com>
On Sun, Oct 07, 2012 at 04:10:41PM +0000, Blue Swirl wrote:
> 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.
>
Correct, I have been able to build QEMU on an i386 host that way. I have
therefore committed the following patch:
commit f1829782d6cb931973d71649f8ad1dad66188c34
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sun Oct 7 20:07:11 2012 +0200
qemu-barrier: Fix compilation on i386 hosts
Commit 1d31fca470648ec66afd8743491bfb5846306341 tried to fix bug
introduced by 610b823ef66b993660f1ab1447a769f190e4f3b3 by including
qemu-common.h, which breaks the build further.
Include compiler.h instead, as suggested by Blue Swirl.
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
diff --git a/qemu-barrier.h b/qemu-barrier.h
index 1de914e..faa83d2 100644
--- a/qemu-barrier.h
+++ b/qemu-barrier.h
@@ -6,7 +6,7 @@
#if defined(__i386__)
-#include "qemu-common.h" /* QEMU_GNUC_PREREQ */
+#include "compiler.h" /* QEMU_GNUC_PREREQ */
/*
* Because of the strongly ordered x86 storage model, wmb() and rmb() are nops
--
Aurelien Jarno GPG: 1024D/F1BCDB73
aurelien@aurel32.net http://www.aurel32.net
prev parent reply other threads:[~2012-10-07 18:10 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-06 10:46 [Qemu-devel] [PATCH] qemu-barrier: Fix compilation on i386 hosts Stefan Weil
2012-10-06 18:35 ` Aurelien Jarno
2012-10-07 16:10 ` Blue Swirl
2012-10-07 18:10 ` Aurelien Jarno [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121007181016.GD4055@ohm.aurel32.net \
--to=aurelien@aurel32.net \
--cc=aliguori@us.ibm.com \
--cc=blauwirbel@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=sw@weilnetz.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.