diff options
| author | Anthony PERARD <anthony.perard@citrix.com> | 2019-06-21 11:54:41 +0100 |
|---|---|---|
| committer | Anthony PERARD <anthony.perard@citrix.com> | 2019-06-24 10:42:30 +0100 |
| commit | a3434a2d56aee3018f4a0f55c7e0f0cda11f3d9e (patch) | |
| tree | c4a553162114eef74a56c3f87758030e913306a1 /hw/block | |
| parent | d1744bd3218daa820744c14572058491e4854399 (diff) | |
| download | qemu-a3434a2d56aee3018f4a0f55c7e0f0cda11f3d9e.zip qemu-a3434a2d56aee3018f4a0f55c7e0f0cda11f3d9e.tar.gz qemu-a3434a2d56aee3018f4a0f55c7e0f0cda11f3d9e.tar.bz2 | |
xen: Import other xen/io/*.h
A Xen public header have been imported into QEMU (by
f65eadb639 "xen: import ring.h from xen"), but there are other header
that depends on ring.h which come from the system when building QEMU.
This patch resolves the issue of having headers from the system
importing a different copie of ring.h.
This patch is prompt by the build issue described in the previous
patch: 'Revert xen/io/ring.h of "Clean up a few header guard symbols"'
ring.h and the new imported headers are moved to
"include/hw/xen/interface" as those describe interfaces with a guest.
The imported headers are cleaned up a bit while importing them: some
part of the file that QEMU doesn't use are removed (description
of how to make hypercall in grant_table.h have been removed).
Other cleanup:
- xen-mapcache.c and xen-legacy-backend.c don't need grant_table.h.
- xenfb.c doesn't need event_channel.h.
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-3-anthony.perard@citrix.com>
Diffstat (limited to 'hw/block')
| -rw-r--r-- | hw/block/xen_blkif.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/hw/block/xen_blkif.h b/hw/block/xen_blkif.h index a353693..9973352 100644 --- a/hw/block/xen_blkif.h +++ b/hw/block/xen_blkif.h @@ -1,9 +1,8 @@ #ifndef XEN_BLKIF_H #define XEN_BLKIF_H -#include "hw/xen/io/ring.h" -#include <xen/io/blkif.h> -#include <xen/io/protocols.h> +#include "hw/xen/interface/io/blkif.h" +#include "hw/xen/interface/io/protocols.h" /* * Not a real protocol. Used to generate ring structs which contain |