[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH 22 of 22] xenpaging: remove private mem_event.h
# HG changeset patch # User Olaf Hering <olaf@xxxxxxxxx> # Date 1307695649 -7200 # Node ID 2b17fb49efd404627bdfff40f0be36e7076b5c00 # Parent 39e5460d899872c9654634a24c66160495f4d3c2 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@xxxxxxxxx> diff -r 39e5460d8998 -r 2b17fb49efd4 tools/xenpaging/mem_event.h --- a/tools/xenpaging/mem_event.h Fri Jun 10 10:47:28 2011 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -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 -r 39e5460d8998 -r 2b17fb49efd4 tools/xenpaging/xenpaging.c --- a/tools/xenpaging/xenpaging.c Fri Jun 10 10:47:28 2011 +0200 +++ b/tools/xenpaging/xenpaging.c Fri Jun 10 10:47:29 2011 +0200 @@ -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 -r 39e5460d8998 -r 2b17fb49efd4 tools/xenpaging/xenpaging.h --- a/tools/xenpaging/xenpaging.h Fri Jun 10 10:47:28 2011 +0200 +++ b/tools/xenpaging/xenpaging.h Fri Jun 10 10:47:29 2011 +0200 @@ -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; _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxxxxxxxx http://lists.xensource.com/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |