]> git.proxmox.com Git - mirror_qemu.git/commit
xen: Import other xen/io/*.h
authorAnthony PERARD <anthony.perard@citrix.com>
Fri, 21 Jun 2019 10:54:41 +0000 (11:54 +0100)
committerAnthony PERARD <anthony.perard@citrix.com>
Mon, 24 Jun 2019 09:42:30 +0000 (10:42 +0100)
commita3434a2d56aee3018f4a0f55c7e0f0cda11f3d9e
treec4a553162114eef74a56c3f87758030e913306a1
parentd1744bd3218daa820744c14572058491e4854399
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>
19 files changed:
hw/9pfs/xen-9pfs.h
hw/block/xen_blkif.h
hw/char/xen_console.c
hw/display/xenfb.c
hw/net/xen_nic.c
hw/usb/xen-usb.c
hw/xen/xen-legacy-backend.c
include/hw/xen/interface/grant_table.h [new file with mode: 0644]
include/hw/xen/interface/io/blkif.h [new file with mode: 0644]
include/hw/xen/interface/io/console.h [new file with mode: 0644]
include/hw/xen/interface/io/fbif.h [new file with mode: 0644]
include/hw/xen/interface/io/kbdif.h [new file with mode: 0644]
include/hw/xen/interface/io/netif.h [new file with mode: 0644]
include/hw/xen/interface/io/protocols.h [new file with mode: 0644]
include/hw/xen/interface/io/ring.h [new file with mode: 0644]
include/hw/xen/interface/io/usbif.h [new file with mode: 0644]
include/hw/xen/interface/io/xenbus.h [new file with mode: 0644]
include/hw/xen/io/ring.h [deleted file]
include/hw/xen/xen_common.h