xenpaging: remove private mem_event.h

tools/xenpaging/mem_event.h is only included in xenpaging.h.
Add the contents into that file and remove mem_event.h.

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Committed-by: Ian Jackson <ian.jackson.citrix.com>

1 files changed, 8 insertions, 3 deletions

diff --git a/tools/xenpaging/xenpaging.h b/tools/xenpaging/xenpaging.h
index 36f4290248..0128c533c2 100644
--- a/tools/xenpaging/xenpaging.h
+++ b/tools/xenpaging/xenpaging.h
@@ -26,12 +26,17 @@
 
 
 #include <xc_private.h>
-
 #include <xen/event_channel.h>
 #include <xen/mem_event.h>
 
-#include "mem_event.h"
-
+typedef struct mem_event {
+    domid_t domain_id;
+    xc_evtchn *xce_handle;
+    int port;
+    mem_event_back_ring_t back_ring;
+    mem_event_shared_page_t *shared_page;
+    void *ring_page;
+} mem_event_t;
 
 typedef struct xenpaging {
     xc_interface *xc_handle;