[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 1/2] Revert xen/io/ring.h of "Clean up a few
From: |
Daniel P . Berrangé |
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 |
User-agent: |
Mutt/1.11.4 (2019-03-13) |
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 <address@hidden>
> ---
> CC: Markus Armbruster <address@hidden>
> ---
>
> 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é <address@hidden>
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 :|