diff options
author | Ian Campbell <ian.campbell@citrix.com> | 2010-10-18 16:43:58 +0100 |
---|---|---|
committer | Ian Campbell <ian.campbell@citrix.com> | 2010-10-18 16:43:58 +0100 |
commit | f114466a23ceaf058ac13b08e83725e6354bc519 (patch) | |
tree | b82fb171c6733c3627cf8f6221fae8b7f2dc038f /tools/libxc/xc_linux.c | |
parent | 3a200f3c4be9bbbf6078ba0a6e6f1f2a543f5378 (diff) | |
download | xen-f114466a23ceaf058ac13b08e83725e6354bc519.tar.gz xen-f114466a23ceaf058ac13b08e83725e6354bc519.tar.bz2 xen-f114466a23ceaf058ac13b08e83725e6354bc519.zip |
libxc: pass an xc_interface handle to page locking functions
Not actually used here but useful to confirm that a handle is passed
down to each location where it will be required once we switch to
hypercall buffers.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'tools/libxc/xc_linux.c')
-rw-r--r-- | tools/libxc/xc_linux.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/libxc/xc_linux.c b/tools/libxc/xc_linux.c index d322b3f42c..014b5505de 100644 --- a/tools/libxc/xc_linux.c +++ b/tools/libxc/xc_linux.c @@ -618,7 +618,7 @@ int xc_gnttab_op(xc_interface *xch, int cmd, void * op, int op_size, int count) hypercall.arg[1] = (unsigned long)op; hypercall.arg[2] = count; - if ( lock_pages(op, count* op_size) != 0 ) + if ( lock_pages(xch, op, count* op_size) != 0 ) { PERROR("Could not lock memory for Xen hypercall"); goto out1; @@ -626,7 +626,7 @@ int xc_gnttab_op(xc_interface *xch, int cmd, void * op, int op_size, int count) ret = do_xen_hypercall(xch, &hypercall); - unlock_pages(op, count * op_size); + unlock_pages(xch, op, count * op_size); out1: return ret; @@ -670,7 +670,7 @@ static void *_gnttab_map_table(xc_interface *xch, int domid, int *gnt_num) *gnt_num = query.nr_frames * (PAGE_SIZE / sizeof(grant_entry_v1_t) ); frame_list = malloc(query.nr_frames * sizeof(unsigned long)); - if ( !frame_list || lock_pages(frame_list, + if ( !frame_list || lock_pages(xch, frame_list, query.nr_frames * sizeof(unsigned long)) ) { ERROR("Alloc/lock frame_list in xc_gnttab_map_table\n"); @@ -714,7 +714,7 @@ static void *_gnttab_map_table(xc_interface *xch, int domid, int *gnt_num) err: if ( frame_list ) { - unlock_pages(frame_list, query.nr_frames * sizeof(unsigned long)); + unlock_pages(xch, frame_list, query.nr_frames * sizeof(unsigned long)); free(frame_list); } if ( pfn_list ) |