From: Olaf Hering <olaf@aepfle.de>
To: xen-devel@lists.xensource.com
Subject: [PATCH 07 of 22] xenpaging: drop xc.c, move xc_mem_paging_flush_ioemu_cache
Date: Fri, 10 Jun 2011 11:12:56 +0200 [thread overview]
Message-ID: <fe8cb47be2adc95e6181.1307697176@probook.site> (raw)
In-Reply-To: <patchbomb.1307697169@probook.site>
# HG changeset patch
# User Olaf Hering <olaf@aepfle.de>
# Date 1307695630 -7200
# Node ID fe8cb47be2adc95e6181de8c166e4460e1a2e40f
# Parent 44997646bd69e746fbf7421009f5175268da28ce
xenpaging: drop xc.c, move xc_mem_paging_flush_ioemu_cache
Move xc_mem_paging_flush_ioemu_cache() into xenpaging and massage it a bit to
use the required members from xenpaging_t.
Also update type of rc to match xs_write() return value.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
diff -r 44997646bd69 -r fe8cb47be2ad tools/xenpaging/xc.c
--- a/tools/xenpaging/xc.c Fri Jun 10 10:47:08 2011 +0200
+++ b/tools/xenpaging/xc.c Fri Jun 10 10:47:10 2011 +0200
@@ -31,24 +31,6 @@
-int xc_mem_paging_flush_ioemu_cache(domid_t domain_id)
-{
- struct xs_handle *xsh = NULL;
- char path[80];
- int rc;
-
- sprintf(path, "/local/domain/0/device-model/%u/command", domain_id);
-
- xsh = xs_daemon_open();
- if ( xsh == NULL )
- return -EIO;
-
- rc = xs_write(xsh, XBT_NULL, path, "flush-cache", strlen("flush-cache"));
-
- xs_daemon_close(xsh);
-
- return rc ? 0 : -1;
-}
int xc_wait_for_event_or_timeout(xc_interface *xch, xc_evtchn *xce, unsigned long ms)
{
diff -r 44997646bd69 -r fe8cb47be2ad tools/xenpaging/xc.h
--- a/tools/xenpaging/xc.h Fri Jun 10 10:47:08 2011 +0200
+++ b/tools/xenpaging/xc.h Fri Jun 10 10:47:10 2011 +0200
@@ -37,7 +37,6 @@
-int xc_mem_paging_flush_ioemu_cache(domid_t domain_id);
int xc_wait_for_event_or_timeout(xc_interface *xch, xc_evtchn *xce, unsigned long ms);
diff -r 44997646bd69 -r fe8cb47be2ad tools/xenpaging/xenpaging.c
--- a/tools/xenpaging/xenpaging.c Fri Jun 10 10:47:08 2011 +0200
+++ b/tools/xenpaging/xenpaging.c Fri Jun 10 10:47:10 2011 +0200
@@ -48,6 +48,20 @@ static void close_handler(int sig)
unlink(filename);
}
+static int xenpaging_mem_paging_flush_ioemu_cache(xenpaging_t *paging)
+{
+ struct xs_handle *xsh = paging->xs_handle;
+ domid_t domain_id = paging->mem_event.domain_id;
+ char path[80];
+ bool rc;
+
+ sprintf(path, "/local/domain/0/device-model/%u/command", domain_id);
+
+ rc = xs_write(xsh, XBT_NULL, path, "flush-cache", strlen("flush-cache"));
+
+ return rc == true ? 0 : -1;
+}
+
static void *init_page(void)
{
void *buffer;
@@ -484,7 +498,7 @@ static int evict_victim(xenpaging_t *pag
else
{
if ( j++ % 1000 == 0 )
- if ( xc_mem_paging_flush_ioemu_cache(paging->mem_event.domain_id) )
+ if ( xenpaging_mem_paging_flush_ioemu_cache(paging) )
ERROR("Error flushing ioemu cache");
}
}
next prev parent reply other threads:[~2011-06-10 9:12 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-10 9:12 [PATCH 00 of 22] xenpaging and libxc fixes for xen-unstable Olaf Hering
2011-06-10 9:12 ` [PATCH 01 of 22] xenpaging: remove unused spinlock in pager Olaf Hering
2011-06-21 16:24 ` Ian Jackson
2011-06-10 9:12 ` [PATCH 02 of 22] tools: merge several bitop functions into xc_bitops.h Olaf Hering
2011-06-21 16:16 ` Ian Jackson
2011-06-21 16:20 ` Olaf Hering
2011-06-21 16:25 ` Ian Jackson
2011-06-21 17:17 ` Olaf Hering
2011-06-21 17:18 ` Ian Jackson
2011-06-22 14:03 ` Ian Jackson
2011-06-10 9:12 ` [PATCH 03 of 22] xenpaging: add xs_handle to struct xenpaging Olaf Hering
2011-06-14 11:05 ` Ian Campbell
2011-06-20 9:58 ` [PATCH 03 of 22 v2] " Olaf Hering
2011-06-21 13:17 ` Ian Campbell
2011-06-21 15:33 ` [PATCH 03 of 22 v3] " Olaf Hering
2011-06-10 9:12 ` [PATCH 04 of 22] xenpaging: drop xc.c, remove ASSERT Olaf Hering
2011-06-10 9:12 ` [PATCH 05 of 22] xenpaging: drop xc.c, remove xc_platform_info_t Olaf Hering
2011-06-10 9:12 ` [PATCH 06 of 22] xenpaging: drop xc.c, remove xc_wait_for_event Olaf Hering
2011-06-10 9:12 ` Olaf Hering [this message]
2011-06-10 9:12 ` [PATCH 08 of 22] xenpaging: drop xc.c, move xc_wait_for_event_or_timeout Olaf Hering
2011-06-10 9:12 ` [PATCH 09 of 22] xenpaging: drop xc.c, remove xc files Olaf Hering
2011-06-10 9:12 ` [PATCH 10 of 22] xenpaging: correct dropping of pages to avoid full ring buffer Olaf Hering
2011-06-10 9:13 ` [PATCH 11 of 22] xenpaging: do not bounce p2mt to xenpaging Olaf Hering
2011-06-13 10:48 ` Tim Deegan
2011-06-20 9:57 ` [PATCH 11 of 22 v2] xenpaging: do not bounce p2mt back to the hypervisor Olaf Hering
2011-06-20 10:36 ` Tim Deegan
2011-06-10 9:13 ` [PATCH 12 of 22] xenpaging: remove srand call Olaf Hering
2011-06-10 9:13 ` [PATCH 13 of 22] xenpaging: remove return values from functions that can not fail Olaf Hering
2011-06-10 9:13 ` [PATCH 14 of 22] xenpaging: catch xc_mem_paging_resume errors Olaf Hering
2011-06-10 9:13 ` [PATCH 15 of 22] xenpaging: remove local domain_id variable Olaf Hering
2011-06-10 9:13 ` [PATCH 16 of 22] xenpaging: move num_pages into xenpaging struct Olaf Hering
2011-06-10 9:13 ` [PATCH 17 of 22] xenpaging: start paging in the middle of gfn range Olaf Hering
2011-06-10 9:13 ` [PATCH 18 of 22] xenpaging: pass integer to xenpaging_populate_page Olaf Hering
2011-06-10 9:13 ` [PATCH 19 of 22] xenpaging: add helper function for unlinking pagefile Olaf Hering
2011-06-10 9:13 ` [PATCH 20 of 22] xenpaging: add watch thread to catch guest shutdown Olaf Hering
2011-06-10 9:13 ` [PATCH 21 of 22] xenpaging: implement stopping of pager by sending SIGTERM/SIGINT Olaf Hering
2011-06-10 9:13 ` [PATCH 22 of 22] xenpaging: remove private mem_event.h Olaf Hering
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fe8cb47be2adc95e6181.1307697176@probook.site \
--to=olaf@aepfle.de \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).