From 2131e4744b591ef304e4ee2dd0d3c6891ad659b9 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Thu, 1 Mar 2012 15:58:02 +0000 Subject: xenpaging: remove obsolete XENMEM_paging_op_resume With changeset 24364:0964341efd65 an event channel based notification of new responses in the ringbuffer is implemented. This makes the memevent interface obsolete. Currently a call to p2m_mem_paging_resume() is triggered twice by xenpaging, once per memevent and once per even channel. In practice this double call does not lead to issues because p2m_mem_paging_resume() processes only available events. xenpaging used the event channel notification since the beginning, but it was a no-op until changeset mentioned above. This change removes the unneeded XENMEM_paging_op_resume functionality. Pagers are notified via an event channel of new requests, and now they are required to notify the hypervisor about their responses also with an event channel. Signed-off-by: Olaf Hering Acked-by: Tim Deegan Acked-by: Ian Jackson Committed-by: Ian Jackson --- tools/xenpaging/xenpaging.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'tools/xenpaging') diff --git a/tools/xenpaging/xenpaging.c b/tools/xenpaging/xenpaging.c index b7b754541a..c0f08e3c4c 100644 --- a/tools/xenpaging/xenpaging.c +++ b/tools/xenpaging/xenpaging.c @@ -656,8 +656,6 @@ static int xenpaging_evict_page(struct xenpaging *paging, unsigned long gfn, int static int xenpaging_resume_page(struct xenpaging *paging, mem_event_response_t *rsp, int notify_policy) { - int ret; - /* Put the page info on the ring */ put_response(&paging->mem_event, rsp); @@ -678,14 +676,7 @@ static int xenpaging_resume_page(struct xenpaging *paging, mem_event_response_t } /* Tell Xen page is ready */ - ret = xc_mem_paging_resume(paging->xc_handle, paging->mem_event.domain_id, - rsp->gfn); - if ( ret == 0 ) - ret = xc_evtchn_notify(paging->mem_event.xce_handle, - paging->mem_event.port); - - out: - return ret; + return xc_evtchn_notify(paging->mem_event.xce_handle, paging->mem_event.port); } static int xenpaging_populate_page(struct xenpaging *paging, unsigned long gfn, int i) -- cgit v1.2.3