diff options
author | Olaf Hering <olaf@aepfle.de> | 2011-06-10 10:47:29 +0200 |
---|---|---|
committer | Olaf Hering <olaf@aepfle.de> | 2011-06-10 10:47:29 +0200 |
commit | 2001efa255f55ccd403ba4c1daf211a8f11445f2 (patch) | |
tree | 1d4bf07b5db09f3c175e116cbcc0757d8dff103a /tools/xenpaging | |
parent | 3568b93ad4b6301b8e66668c8e9c8427adcfa2a7 (diff) | |
download | xen-2001efa255f55ccd403ba4c1daf211a8f11445f2.tar.gz xen-2001efa255f55ccd403ba4c1daf211a8f11445f2.tar.bz2 xen-2001efa255f55ccd403ba4c1daf211a8f11445f2.zip |
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>
Diffstat (limited to 'tools/xenpaging')
-rw-r--r-- | tools/xenpaging/mem_event.h | 57 | ||||
-rw-r--r-- | tools/xenpaging/xenpaging.c | 3 | ||||
-rw-r--r-- | tools/xenpaging/xenpaging.h | 11 |
3 files changed, 8 insertions, 63 deletions
diff --git a/tools/xenpaging/mem_event.h b/tools/xenpaging/mem_event.h deleted file mode 100644 index d63d43d3cc..0000000000 --- a/tools/xenpaging/mem_event.h +++ /dev/null @@ -1,57 +0,0 @@ -/****************************************************************************** - * tools/xenpaging/mem_event.h - * - * Memory event structures. - * - * Copyright (c) 2009 Citrix Systems, Inc. (Patrick Colp) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#ifndef __XEN_MEM_EVENT_H__ -#define __XEN_MEM_EVENT_H__ - - -#include <xc_private.h> - -#include <xen/event_channel.h> -#include <xen/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; - - -#endif // __XEN_MEM_EVENT_H__ - - -/* - * Local variables: - * mode: C - * c-set-style: "BSD" - * c-basic-offset: 4 - * tab-width: 4 - * indent-tabs-mode: nil - * End: - */ diff --git a/tools/xenpaging/xenpaging.c b/tools/xenpaging/xenpaging.c index 14b64df968..63b1e9f045 100644 --- a/tools/xenpaging/xenpaging.c +++ b/tools/xenpaging/xenpaging.c @@ -31,11 +31,8 @@ #include <xc_private.h> #include <xs.h> -#include <xen/mem_event.h> - #include "xc_bitops.h" #include "file_ops.h" - #include "policy.h" #include "xenpaging.h" 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; |