diff options
author | Steven Hand <steven@xensource.com> | 2007-04-02 16:46:52 +0100 |
---|---|---|
committer | Steven Hand <steven@xensource.com> | 2007-04-02 16:46:52 +0100 |
commit | e2a44bc7a4f19cebdb17a5153cc443f420d9fe5d (patch) | |
tree | 33936b3b4898a35c5390e544b6f65f72f8618e18 /tools/libxc/xc_core_x86.c | |
parent | 970ce2580bd1403a8c3ac5ed8cf7055ca1e6b20f (diff) | |
download | xen-e2a44bc7a4f19cebdb17a5153cc443f420d9fe5d.tar.gz xen-e2a44bc7a4f19cebdb17a5153cc443f420d9fe5d.tar.bz2 xen-e2a44bc7a4f19cebdb17a5153cc443f420d9fe5d.zip |
Some save/restore cleanups.
Signed-off-by: Steven Hand <steven@xensource.com>
Diffstat (limited to 'tools/libxc/xc_core_x86.c')
-rw-r--r-- | tools/libxc/xc_core_x86.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/libxc/xc_core_x86.c b/tools/libxc/xc_core_x86.c index bd82110713..0f2a19c451 100644 --- a/tools/libxc/xc_core_x86.c +++ b/tools/libxc/xc_core_x86.c @@ -38,7 +38,7 @@ xc_core_arch_memory_map_get(int xc_handle, xc_dominfo_t *info, xc_core_memory_map_t **mapp, unsigned int *nr_entries) { - unsigned long max_pfn = max_gpfn(xc_handle, info->domid); + unsigned long p2m_size = max_gpfn(xc_handle, info->domid); xc_core_memory_map_t *map; map = malloc(sizeof(*map)); @@ -49,7 +49,7 @@ xc_core_arch_memory_map_get(int xc_handle, xc_dominfo_t *info, } map->addr = 0; - map->size = max_pfn << PAGE_SHIFT; + map->size = p2m_size << PAGE_SHIFT; *mapp = map; *nr_entries = 1; @@ -65,13 +65,13 @@ xc_core_arch_map_p2m(int xc_handle, xc_dominfo_t *info, xen_pfn_t *live_p2m_frame_list_list = NULL; xen_pfn_t *live_p2m_frame_list = NULL; uint32_t dom = info->domid; - unsigned long max_pfn = max_gpfn(xc_handle, info->domid); + unsigned long p2m_size = max_gpfn(xc_handle, info->domid); int ret = -1; int err; - if ( max_pfn < info->nr_pages ) + if ( p2m_size < info->nr_pages ) { - ERROR("max_pfn < nr_pages -1 (%lx < %lx", max_pfn, info->nr_pages - 1); + ERROR("p2m_size < nr_pages -1 (%lx < %lx", p2m_size, info->nr_pages - 1); goto out; } @@ -106,7 +106,7 @@ xc_core_arch_map_p2m(int xc_handle, xc_dominfo_t *info, goto out; } - *pfnp = max_pfn; + *pfnp = p2m_size; ret = 0; |