All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Daniel P. Berrangé" <berrange@redhat.com>
To: Anthony PERARD <anthony.perard@citrix.com>
Cc: xen-devel@lists.xenproject.org,
	Stefano Stabellini <sstabellini@kernel.org>,
	qemu-devel@nongnu.org, Paul Durrant <paul.durrant@citrix.com>,
	Markus Armbruster <armbru@redhat.com>
Subject: Re: [Xen-devel] [PATCH v3 1/2] Revert xen/io/ring.h of "Clean up a few header guard symbols"
Date: Fri, 21 Jun 2019 12:07:04 +0100	[thread overview]
Message-ID: <20190621110704.GI11706@redhat.com> (raw)
In-Reply-To: <20190621105441.3025-2-anthony.perard@citrix.com>

On Fri, Jun 21, 2019 at 11:54:40AM +0100, Anthony PERARD wrote:
> This reverts changes to include/hw/xen/io/ring.h from commit
> 37677d7db39a3c250ad661d00fb7c3b59d047b1f.
> 
> Following 37677d7db3 "Clean up a few header guard symbols", QEMU start
> to fail to build:
> 
> In file included from ~/xen/tools/../tools/include/xen/io/blkif.h:31:0,
>                  from ~/xen/tools/qemu-xen-dir/hw/block/xen_blkif.h:5,
>                  from ~/xen/tools/qemu-xen-dir/hw/block/xen-block.c:22:
> ~/xen/tools/../tools/include/xen/io/ring.h:68:0: error: "__CONST_RING_SIZE" redefined [-Werror]
>  #define __CONST_RING_SIZE(_s, _sz) \
> 
> In file included from ~/xen/tools/qemu-xen-dir/hw/block/xen_blkif.h:4:0,
>                  from ~/xen/tools/qemu-xen-dir/hw/block/xen-block.c:22:
> ~/xen/tools/qemu-xen-dir/include/hw/xen/io/ring.h:66:0: note: this is the location of the previous definition
>  #define __CONST_RING_SIZE(_s, _sz) \
> 
> The issue is that some public xen headers have been imported (by
> f65eadb639 "xen: import ring.h from xen") but not all. With the change
> in the guards symbole, the ring.h header start to be imported twice.
> 
> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
> ---
> CC: Markus Armbruster <armbru@redhat.com>
> ---
> 
> Notes:
>     v3:
>     - new patch, replace "xen: Fix build with public headers" from previous
>       patch series version
>     - Revert problematic change instead.
> 
>  include/hw/xen/io/ring.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

WARNING: multiple messages have this Message-ID (diff)
From: "Daniel P. Berrangé" <berrange@redhat.com>
To: Anthony PERARD <anthony.perard@citrix.com>
Cc: xen-devel@lists.xenproject.org,
	Stefano Stabellini <sstabellini@kernel.org>,
	qemu-devel@nongnu.org, Paul Durrant <paul.durrant@citrix.com>,
	Markus Armbruster <armbru@redhat.com>
Subject: Re: [Qemu-devel] [PATCH v3 1/2] Revert xen/io/ring.h of "Clean up a few header guard symbols"
Date: Fri, 21 Jun 2019 12:07:04 +0100	[thread overview]
Message-ID: <20190621110704.GI11706@redhat.com> (raw)
In-Reply-To: <20190621105441.3025-2-anthony.perard@citrix.com>

On Fri, Jun 21, 2019 at 11:54:40AM +0100, Anthony PERARD wrote:
> This reverts changes to include/hw/xen/io/ring.h from commit
> 37677d7db39a3c250ad661d00fb7c3b59d047b1f.
> 
> Following 37677d7db3 "Clean up a few header guard symbols", QEMU start
> to fail to build:
> 
> In file included from ~/xen/tools/../tools/include/xen/io/blkif.h:31:0,
>                  from ~/xen/tools/qemu-xen-dir/hw/block/xen_blkif.h:5,
>                  from ~/xen/tools/qemu-xen-dir/hw/block/xen-block.c:22:
> ~/xen/tools/../tools/include/xen/io/ring.h:68:0: error: "__CONST_RING_SIZE" redefined [-Werror]
>  #define __CONST_RING_SIZE(_s, _sz) \
> 
> In file included from ~/xen/tools/qemu-xen-dir/hw/block/xen_blkif.h:4:0,
>                  from ~/xen/tools/qemu-xen-dir/hw/block/xen-block.c:22:
> ~/xen/tools/qemu-xen-dir/include/hw/xen/io/ring.h:66:0: note: this is the location of the previous definition
>  #define __CONST_RING_SIZE(_s, _sz) \
> 
> The issue is that some public xen headers have been imported (by
> f65eadb639 "xen: import ring.h from xen") but not all. With the change
> in the guards symbole, the ring.h header start to be imported twice.
> 
> Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
> ---
> CC: Markus Armbruster <armbru@redhat.com>
> ---
> 
> Notes:
>     v3:
>     - new patch, replace "xen: Fix build with public headers" from previous
>       patch series version
>     - Revert problematic change instead.
> 
>  include/hw/xen/io/ring.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|


  reply	other threads:[~2019-06-21 11:07 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-21 10:54 [Xen-devel] [PATCH v3 0/2] Fix build of Xen support + cleanup Anthony PERARD
2019-06-21 10:54 ` [Qemu-devel] " Anthony PERARD
2019-06-21 10:54 ` [Xen-devel] [PATCH v3 1/2] Revert xen/io/ring.h of "Clean up a few header guard symbols" Anthony PERARD
2019-06-21 10:54   ` [Qemu-devel] " Anthony PERARD
2019-06-21 11:07   ` Daniel P. Berrangé [this message]
2019-06-21 11:07     ` Daniel P. Berrangé
2019-06-21 12:14   ` [Xen-devel] " Paul Durrant
2019-06-21 12:14     ` [Qemu-devel] " Paul Durrant
2019-06-21 10:54 ` [Xen-devel] [PATCH v3 2/2] xen: Import other xen/io/*.h Anthony PERARD
2019-06-21 10:54   ` [Qemu-devel] " Anthony PERARD
2019-06-21 11:10   ` [Xen-devel] " Daniel P. Berrangé
2019-06-21 11:10     ` [Qemu-devel] " Daniel P. Berrangé
2019-06-21 12:13   ` [Xen-devel] " Paul Durrant
2019-06-21 12:13     ` [Qemu-devel] " Paul Durrant
2019-06-21 12:09 ` [Xen-devel] [PATCH v3 0/2] Fix build of Xen support + cleanup no-reply
2019-06-21 12:09   ` [Qemu-devel] " no-reply
2019-06-21 13:33 ` no-reply
2019-06-21 13:33   ` [Qemu-devel] " no-reply

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=20190621110704.GI11706@redhat.com \
    --to=berrange@redhat.com \
    --cc=anthony.perard@citrix.com \
    --cc=armbru@redhat.com \
    --cc=paul.durrant@citrix.com \
    --cc=qemu-devel@nongnu.org \
    --cc=sstabellini@kernel.org \
    --cc=xen-devel@lists.xenproject.org \
    /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.