58 lines
1.8 KiB
Diff
58 lines
1.8 KiB
Diff
|
changeset: 23590:d957acb8bee6
|
||
|
|
user: Olaf Hering <olaf@aepfle.de>
|
||
|
|
date: Fri Jun 10 10:47:20 2011 +0200
|
||
|
|
files: tools/xenpaging/xenpaging.c
|
||
|
|
description:
|
||
|
|
xenpaging: remove local domain_id variable
|
||
|
|
|
||
|
|
Remove the local domain_id variable, it is already fetched from
|
||
|
|
paging->mem_event in other places.
|
||
|
|
Update the sprintf format string to use unsigned argument.
|
||
|
|
|
||
|
|
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
||
|
|
Committed-by: Ian Jackson <ian.jackson.citrix.com>
|
||
|
|
|
||
|
|
|
||
|
|
---
|
||
|
|
tools/xenpaging/xenpaging.c | 8 +++-----
|
||
|
|
1 file changed, 3 insertions(+), 5 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
|
||
|
|
@@ -552,7 +552,6 @@ static int evict_victim(xenpaging_t *pag
|
||
|
|
int main(int argc, char *argv[])
|
||
|
|
{
|
||
|
|
struct sigaction act;
|
||
|
|
- domid_t domain_id;
|
||
|
|
int num_pages;
|
||
|
|
xenpaging_t *paging;
|
||
|
|
xenpaging_victim_t *victims;
|
||
|
|
@@ -573,11 +572,10 @@ int main(int argc, char *argv[])
|
||
|
|
return -1;
|
||
|
|
}
|
||
|
|
|
||
|
|
- domain_id = atoi(argv[1]);
|
||
|
|
num_pages = atoi(argv[2]);
|
||
|
|
|
||
|
|
/* Initialise domain paging */
|
||
|
|
- paging = xenpaging_init(domain_id);
|
||
|
|
+ paging = xenpaging_init(atoi(argv[1]));
|
||
|
|
if ( paging == NULL )
|
||
|
|
{
|
||
|
|
fprintf(stderr, "Error initialising paging");
|
||
|
|
@@ -585,10 +583,10 @@ int main(int argc, char *argv[])
|
||
|
|
}
|
||
|
|
xch = paging->xc_handle;
|
||
|
|
|
||
|
|
- DPRINTF("starting %s %u %d\n", argv[0], domain_id, num_pages);
|
||
|
|
+ DPRINTF("starting %s %u %d\n", argv[0], paging->mem_event.domain_id, num_pages);
|
||
|
|
|
||
|
|
/* Open file */
|
||
|
|
- sprintf(filename, "page_cache_%d", domain_id);
|
||
|
|
+ sprintf(filename, "page_cache_%u", paging->mem_event.domain_id);
|
||
|
|
fd = open(filename, open_flags, open_mode);
|
||
|
|
if ( fd < 0 )
|
||
|
|
{
|