diff options
| author | Anthony PERARD <anthony.perard@citrix.com> | 2019-06-21 11:54:40 +0100 |
|---|---|---|
| committer | Anthony PERARD <anthony.perard@citrix.com> | 2019-06-24 10:42:30 +0100 |
| commit | d1744bd3218daa820744c14572058491e4854399 (patch) | |
| tree | 911f395dd1de9fa2233038588fa49599025ff6e5 /include | |
| parent | 6e8d4593536a59832dbbecce540498f69b75b644 (diff) | |
| download | qemu-d1744bd3218daa820744c14572058491e4854399.zip qemu-d1744bd3218daa820744c14572058491e4854399.tar.gz qemu-d1744bd3218daa820744c14572058491e4854399.tar.bz2 | |
Revert xen/io/ring.h of "Clean up a few header guard symbols"
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>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Paul Durrant <paul.durrant@citrix.com>
Message-Id: <20190621105441.3025-2-anthony.perard@citrix.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/xen/io/ring.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/hw/xen/io/ring.h b/include/hw/xen/io/ring.h index 62abfd7..1adacf0 100644 --- a/include/hw/xen/io/ring.h +++ b/include/hw/xen/io/ring.h @@ -24,8 +24,8 @@ * Tim Deegan and Andrew Warfield November 2004. */ -#ifndef XEN_PUBLIC_IO_RING_H -#define XEN_PUBLIC_IO_RING_H +#ifndef __XEN_PUBLIC_IO_RING_H__ +#define __XEN_PUBLIC_IO_RING_H__ /* * When #include'ing this header, you need to provide the following @@ -469,7 +469,7 @@ struct name##_data_intf { \ }; \ DEFINE_XEN_FLEX_RING(name) -#endif /* XEN_PUBLIC_IO_RING_H */ +#endif /* __XEN_PUBLIC_IO_RING_H__ */ /* * Local variables: |