Olaf Hering
e2d8bf077a
Merge paging related fixes from xen-unstable: 23506-x86_Disable_set_gpfn_from_mfn_until_m2p_table_is_allocated..patch 23507-xenpaging_update_machine_to_phys_mapping_during_page_deallocation.patch 23509-x86_32_Fix_build_Define_machine_to_phys_mapping_valid.patch 23562-xenpaging_remove_unused_spinlock_in_pager.patch 23576-x86_show_page_walk_also_for_early_page_faults.patch 23577-tools_merge_several_bitop_functions_into_xc_bitops.h.patch 23578-xenpaging_add_xs_handle_to_struct_xenpaging.patch 23579-xenpaging_drop_xc.c_remove_ASSERT.patch 23580-xenpaging_drop_xc.c_remove_xc_platform_info_t.patch 23581-xenpaging_drop_xc.c_remove_xc_wait_for_event.patch 23582-xenpaging_drop_xc.c_move_xc_mem_paging_flush_ioemu_cache.patch 23583-xenpaging_drop_xc.c_move_xc_wait_for_event_or_timeout.patch 23584-xenpaging_drop_xc.c_remove_xc_files.patch 23585-xenpaging_correct_dropping_of_pages_to_avoid_full_ring_buffer.patch 23586-xenpaging_do_not_bounce_p2mt_back_to_the_hypervisor.patch 23587-xenpaging_remove_srand_call.patch 23588-xenpaging_remove_return_values_from_functions_that_can_not_fail.patch 23589-xenpaging_catch_xc_mem_paging_resume_errors.patch 23590-xenpaging_remove_local_domain_id_variable.patch 23591-xenpaging_move_num_pages_into_xenpaging_struct.patch 23592-xenpaging_start_paging_in_the_middle_of_gfn_range.patch 23593-xenpaging_pass_integer_to_xenpaging_populate_page.patch 23594-xenpaging_add_helper_function_for_unlinking_pagefile.patch 23595-xenpaging_add_watch_thread_to_catch_guest_shutdown.patch 23596-xenpaging_implement_stopping_of_pager_by_sending_SIGTERM-SIGINT.patch 23597-xenpaging_remove_private_mem_event.h.patch 23599-tools_fix_build_after_recent_xenpaging_changes.patch 23817-mem_event_add_ref_counting_for_free_requestslots.patch 23818-mem_event_use_mem_event_mark_and_pause_in_mem_event_check_ring.patch 23827-xenpaging_use_batch_of_pages_during_final_page-in.patch 23841-mem_event_pass_mem_event_domain_pointer_to_mem_event_functions.patch 23842-mem_event_use_different_ringbuffers_for_share_paging_and_access.patch 23874-xenpaging_track_number_of_paged_pages_in_struct_domain.patch 23904-xenpaging_use_p2m-get_entry_in_p2m_mem_paging_functions.patch 23905-xenpaging_fix_locking_in_p2m_mem_paging_functions.patch 23906-xenpaging_remove_confusing_comment_from_p2m_mem_paging_populate.patch 23908-p2m_query-modify_p2mt_with_p2m_lock_held.patch 23943-xenpaging_clear_page_content_after_evict.patch 23953-xenpaging_handle_evict_failures.patch 23978-xenpaging_check_p2mt_in_p2m_mem_paging_functions.patch 23979-xenpaging_document_p2m_mem_paging_functions.patch 23980-xenpaging_disallow_paging_in_a_PoD_guest.patch Remove obsolete patches: x86-show-page-walk-early.patch xenpaging.23817-mem_event_check_ring.patch xenpaging.catch-xc_mem_paging_resume-error.patch xenpaging.guest_remove_page.slow_path.patch xenpaging.mem_event-no-p2mt.patch xenpaging.no-srand.patch xenpaging.return-void.patch xenpaging.xenpaging_populate_page-gfn.patch - xen.spec: use changeset number as patch number for upstream patches OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=151
124 lines
3.4 KiB
Diff
124 lines
3.4 KiB
Diff
changeset: 23597:3dcb553f3ba9
|
|
user: Olaf Hering <olaf@aepfle.de>
|
|
date: Fri Jun 10 10:47:29 2011 +0200
|
|
files: tools/xenpaging/mem_event.h tools/xenpaging/xenpaging.c tools/xenpaging/xenpaging.h
|
|
description:
|
|
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>
|
|
|
|
|
|
---
|
|
tools/xenpaging/mem_event.h | 57 --------------------------------------------
|
|
tools/xenpaging/xenpaging.c | 3 --
|
|
tools/xenpaging/xenpaging.h | 11 ++++++--
|
|
3 files changed, 8 insertions(+), 63 deletions(-)
|
|
|
|
Index: xen-4.1.2-testing/tools/xenpaging/mem_event.h
|
|
===================================================================
|
|
--- xen-4.1.2-testing.orig/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:
|
|
- */
|
|
Index: xen-4.1.2-testing/tools/xenpaging/xenpaging.c
|
|
===================================================================
|
|
--- xen-4.1.2-testing.orig/tools/xenpaging/xenpaging.c
|
|
+++ xen-4.1.2-testing/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"
|
|
|
|
Index: xen-4.1.2-testing/tools/xenpaging/xenpaging.h
|
|
===================================================================
|
|
--- xen-4.1.2-testing.orig/tools/xenpaging/xenpaging.h
|
|
+++ xen-4.1.2-testing/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;
|