diff options
| author | Olaf Hering <olaf@aepfle.de> | 2012-02-20 21:18:44 +0100 |
|---|---|---|
| committer | Olaf Hering <olaf@aepfle.de> | 2012-02-20 21:18:44 +0100 |
| commit | 8e37ea4bb89f91593d7a07ebc049da540f6279ac (patch) | |
| tree | ceaea355a05ba4b2f7c95d44e7af3d4dd733b729 /tools/xenpaging | |
| parent | c184cdeb7d53158e415453d9fa148a462b90b287 (diff) | |
| download | xen-8e37ea4bb89f91593d7a07ebc049da540f6279ac.tar.gz xen-8e37ea4bb89f91593d7a07ebc049da540f6279ac.tar.bz2 xen-8e37ea4bb89f91593d7a07ebc049da540f6279ac.zip | |
xenpaging: move page_buffer into struct xenpaging
Signed-off-by: Olaf Hering <olaf@aepfle.de>
Committed-by: Ian Jackson <ian.jackson.citrix.com>
Diffstat (limited to 'tools/xenpaging')
| -rw-r--r-- | tools/xenpaging/xenpaging.c | 15 | ||||
| -rw-r--r-- | tools/xenpaging/xenpaging.h | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/tools/xenpaging/xenpaging.c b/tools/xenpaging/xenpaging.c index 6562ef1084..5f943b5ad7 100644 --- a/tools/xenpaging/xenpaging.c +++ b/tools/xenpaging/xenpaging.c @@ -44,7 +44,6 @@ static char *dom_path; static char watch_token[16]; static char *filename; static int interrupted; -static void *paging_buffer = NULL; static void unlink_pagefile(void) { @@ -441,8 +440,8 @@ static struct xenpaging *xenpaging_init(int argc, char *argv[]) goto err; } - paging_buffer = init_page(); - if ( !paging_buffer ) + paging->paging_buffer = init_page(); + if ( !paging->paging_buffer ) { PERROR("Creating page aligned load buffer"); goto err; @@ -465,6 +464,11 @@ static struct xenpaging *xenpaging_init(int argc, char *argv[]) xs_close(paging->xs_handle); if ( xch ) xc_interface_close(xch); + if ( paging->paging_buffer ) + { + munlock(paging->paging_buffer, PAGE_SIZE); + free(paging->paging_buffer); + } if ( paging->mem_event.shared_page ) { munlock(paging->mem_event.shared_page, PAGE_SIZE); @@ -687,7 +691,7 @@ static int xenpaging_populate_page(struct xenpaging *paging, unsigned long gfn, DPRINTF("populate_page < gfn %lx pageslot %d\n", gfn, i); /* Read page */ - ret = read_page(paging->fd, paging_buffer, i); + ret = read_page(paging->fd, paging->paging_buffer, i); if ( ret != 0 ) { PERROR("Error reading page"); @@ -697,8 +701,7 @@ static int xenpaging_populate_page(struct xenpaging *paging, unsigned long gfn, do { /* Tell Xen to allocate a page for the domain */ - ret = xc_mem_paging_load(xch, paging->mem_event.domain_id, gfn, - paging_buffer); + ret = xc_mem_paging_load(xch, paging->mem_event.domain_id, gfn, paging->paging_buffer); if ( ret < 0 ) { if ( errno == ENOMEM ) diff --git a/tools/xenpaging/xenpaging.h b/tools/xenpaging/xenpaging.h index b5f160d8c3..746556b1a0 100644 --- a/tools/xenpaging/xenpaging.h +++ b/tools/xenpaging/xenpaging.h @@ -49,6 +49,8 @@ struct xenpaging { unsigned long *slot_to_gfn; int *gfn_to_slot; + void *paging_buffer; + struct mem_event mem_event; int fd; /* number of pages for which data structures were allocated */ |