From: Olaf Hering <olaf@aepfle.de>
To: xen-devel@lists.xensource.com
Subject: [PATCH 18 of 22] xenpaging: pass integer to xenpaging_populate_page
Date: Fri, 10 Jun 2011 11:13:07 +0200 [thread overview]
Message-ID: <3d8e65d22c13aeebe3f1.1307697187@probook.site> (raw)
In-Reply-To: <patchbomb.1307697169@probook.site>
# HG changeset patch
# User Olaf Hering <olaf@aepfle.de>
# Date 1307695644 -7200
# Node ID 3d8e65d22c13aeebe3f1e25e2dd9724c3efcf8d6
# Parent 6c7c51f831bfe143093146d67a205b6660490021
xenpaging: pass integer to xenpaging_populate_page
Pass gfn as integer to xenpaging_populate_page(). xc_map_foreign_pages()
takes a pointer to a list of gfns, but its a const pointer. So writing
the value back to the caller is not needed.
Signed-off-by: Olaf Hering <olaf@aepfle.de>
diff -r 6c7c51f831bf -r 3d8e65d22c13 tools/xenpaging/xenpaging.c
--- a/tools/xenpaging/xenpaging.c Fri Jun 10 10:47:23 2011 +0200
+++ b/tools/xenpaging/xenpaging.c Fri Jun 10 10:47:24 2011 +0200
@@ -458,27 +458,24 @@ static int xenpaging_resume_page(xenpagi
}
static int xenpaging_populate_page(xenpaging_t *paging,
- uint64_t *gfn, int fd, int i)
+ xen_pfn_t gfn, int fd, int i)
{
xc_interface *xch = paging->xc_handle;
- unsigned long _gfn;
void *page;
int ret;
unsigned char oom = 0;
- _gfn = *gfn;
- DPRINTF("populate_page < gfn %lx pageslot %d\n", _gfn, i);
+ DPRINTF("populate_page < gfn %"PRI_xen_pfn" pageslot %d\n", gfn, i);
do
{
/* Tell Xen to allocate a page for the domain */
- ret = xc_mem_paging_prep(xch, paging->mem_event.domain_id,
- _gfn);
+ ret = xc_mem_paging_prep(xch, paging->mem_event.domain_id, gfn);
if ( ret != 0 )
{
if ( errno == ENOMEM )
{
if ( oom++ == 0 )
- DPRINTF("ENOMEM while preparing gfn %lx\n", _gfn);
+ DPRINTF("ENOMEM while preparing gfn %"PRI_xen_pfn"\n", gfn);
sleep(1);
continue;
}
@@ -491,8 +488,7 @@ static int xenpaging_populate_page(xenpa
/* Map page */
ret = -EFAULT;
page = xc_map_foreign_pages(xch, paging->mem_event.domain_id,
- PROT_READ | PROT_WRITE, &_gfn, 1);
- *gfn = _gfn;
+ PROT_READ | PROT_WRITE, &gfn, 1);
if ( page == NULL )
{
ERROR("Error mapping page: page is null");
@@ -667,7 +663,7 @@ int main(int argc, char *argv[])
else
{
/* Populate the page */
- rc = xenpaging_populate_page(paging, &req.gfn, fd, i);
+ rc = xenpaging_populate_page(paging, req.gfn, fd, i);
if ( rc != 0 )
{
ERROR("Error populating page");
next prev parent reply other threads:[~2011-06-10 9:13 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 ` [PATCH 07 of 22] xenpaging: drop xc.c, move xc_mem_paging_flush_ioemu_cache Olaf Hering
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 ` Olaf Hering [this message]
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=3d8e65d22c13aeebe3f1.1307697187@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).