From a3434a2d56aee3018f4a0f55c7e0f0cda11f3d9e Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Fri, 21 Jun 2019 11:54:41 +0100 Subject: xen: Import other xen/io/*.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Daniel P. Berrangé Reviewed-by: Paul Durrant Message-Id: <20190621105441.3025-3-anthony.perard@citrix.com> --- hw/display/xenfb.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'hw/display/xenfb.c') diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c index 6202f11..3c79913 100644 --- a/hw/display/xenfb.c +++ b/hw/display/xenfb.c @@ -32,10 +32,9 @@ #include "ui/console.h" #include "hw/xen/xen-legacy-backend.h" -#include -#include -#include -#include +#include "hw/xen/interface/io/fbif.h" +#include "hw/xen/interface/io/kbdif.h" +#include "hw/xen/interface/io/protocols.h" #include "trace.h" -- cgit v1.1