Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:12.2
xen
23593-xenpaging_pass_integer_to_xenpaging_popul...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 23593-xenpaging_pass_integer_to_xenpaging_populate_page.patch of Package xen
changeset: 23593:7d72475641fa user: Olaf Hering <olaf@aepfle.de> date: Fri Jun 10 10:47:24 2011 +0200 files: tools/xenpaging/xenpaging.c description: 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> Committed-by: Ian Jackson <ian.jackson.citrix.com> --- tools/xenpaging/xenpaging.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) 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 @@ -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");
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor