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>
This commit is contained in:
Olaf Hering committed 2011-06-10 10:47:29 +02:00
1 parent 3568b93ad4
commit 2001efa255
3 files changed
+8 -63

No files matched your search

-57
View File
@@ -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:
*/
-3
View File
@@ -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"
+8 -3
View File
@@ -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;
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.