# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1287418573 -3600
# Node ID d923bf8456ad69b2745db2b1ace9d50e179062af
# Parent 90a64629f7c0c2cd6d244b4a00cc20e1e277d349
libxc: add xc_domain_maximum_gpfn to wrap XENMEM_maximum_gpfn
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Signed-off-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
tools/libxc/ia64/xc_ia64_linux_save.c | 2 +-
tools/libxc/ia64/xc_ia64_stubs.c | 6 +++---
tools/libxc/xc_core_x86.c | 2 +-
tools/libxc/xc_domain.c | 5 +++++
tools/libxc/xc_domain_save.c | 2 +-
tools/libxc/xenctrl.h | 2 ++
6 files changed, 13 insertions(+), 6 deletions(-)
diff -r 90a64629f7c0 -r d923bf8456ad tools/libxc/ia64/xc_ia64_linux_save.c
--- a/tools/libxc/ia64/xc_ia64_linux_save.c Mon Oct 18 17:15:26 2010 +0100
+++ b/tools/libxc/ia64/xc_ia64_linux_save.c Mon Oct 18 17:16:13 2010 +0100
@@ -487,7 +487,7 @@ xc_domain_save(xc_interface *xch, int io
goto out;
}
- p2m_size = xc_memory_op(xch, XENMEM_maximum_gpfn, &dom) + 1;
+ p2m_size = xc_domain_maximum_gpfn(xch, dom) + 1;
/* This is expected by xm restore. */
if (write_exact(io_fd, &p2m_size, sizeof(unsigned long))) {
diff -r 90a64629f7c0 -r d923bf8456ad tools/libxc/ia64/xc_ia64_stubs.c
--- a/tools/libxc/ia64/xc_ia64_stubs.c Mon Oct 18 17:15:26 2010 +0100
+++ b/tools/libxc/ia64/xc_ia64_stubs.c Mon Oct 18 17:16:13 2010 +0100
@@ -114,7 +114,7 @@ xc_ia64_copy_memmap(xc_interface *xch, u
int ret;
- gpfn_max_prev = xc_memory_op(xch, XENMEM_maximum_gpfn, &domid);
+ gpfn_max_prev = xc_domain_maximum_gpfn(xch, domid);
if (gpfn_max_prev < 0)
return -1;
@@ -143,7 +143,7 @@ xc_ia64_copy_memmap(xc_interface *xch, u
goto again;
}
- gpfn_max_post = xc_memory_op(xch, XENMEM_maximum_gpfn, &domid);
+ gpfn_max_post = xc_domain_maximum_gpfn(xch, domid);
if (gpfn_max_prev < 0) {
free(memmap_info);
return -1;
@@ -190,7 +190,7 @@ xc_ia64_map_foreign_p2m(xc_interface *xc
int ret;
int saved_errno;
- gpfn_max = xc_memory_op(xch, XENMEM_maximum_gpfn, &dom);
+ gpfn_max = xc_domain_maximum_gpfn(xch, dom);
if (gpfn_max < 0)
return NULL;
p2m_size =
diff -r 90a64629f7c0 -r d923bf8456ad tools/libxc/xc_core_x86.c
--- a/tools/libxc/xc_core_x86.c Mon Oct 18 17:15:26 2010 +0100
+++ b/tools/libxc/xc_core_x86.c Mon Oct 18 17:16:13 2010 +0100
@@ -42,7 +42,7 @@ xc_core_arch_gpfn_may_present(struct xc_
static int nr_gpfns(xc_interface *xch, domid_t domid)
{
- return xc_memory_op(xch, XENMEM_maximum_gpfn, &domid) + 1;
+ return xc_domain_maximum_gpfn(xch, domid) + 1;
}
int
diff -r 90a64629f7c0 -r d923bf8456ad tools/libxc/xc_domain.c
--- a/tools/libxc/xc_domain.c Mon Oct 18 17:15:26 2010 +0100
+++ b/tools/libxc/xc_domain.c Mon Oct 18 17:16:13 2010 +0100
@@ -579,6 +579,11 @@ int xc_domain_get_tsc_info(xc_interface
}
+int xc_domain_maximum_gpfn(xc_interface *xch, domid_t domid)
+{
+ return xc_memory_op(xch, XENMEM_maximum_gpfn, &domid);
+}
+
int xc_domain_increase_reservation(xc_interface *xch,
uint32_t domid,
unsigned long nr_extents,
diff -r 90a64629f7c0 -r d923bf8456ad tools/libxc/xc_domain_save.c
--- a/tools/libxc/xc_domain_save.c Mon Oct 18 17:15:26 2010 +0100
+++ b/tools/libxc/xc_domain_save.c Mon Oct 18 17:16:13 2010 +0100
@@ -979,7 +979,7 @@ int xc_domain_save(xc_interface *xch, in
}
/* Get the size of the P2M table */
- dinfo->p2m_size = xc_memory_op(xch, XENMEM_maximum_gpfn, &dom) + 1;
+ dinfo->p2m_size = xc_domain_maximum_gpfn(xch, dom) + 1;
if ( dinfo->p2m_size > ~XEN_DOMCTL_PFINFO_LTAB_MASK )
{
diff -r 90a64629f7c0 -r d923bf8456ad tools/libxc/xenctrl.h
--- a/tools/libxc/xenctrl.h Mon Oct 18 17:15:26 2010 +0100
+++ b/tools/libxc/xenctrl.h Mon Oct 18 17:16:13 2010 +0100
@@ -784,6 +784,8 @@ int xc_domain_get_tsc_info(xc_interface
uint32_t *incarnation);
int xc_domain_disable_migrate(xc_interface *xch, uint32_t domid);
+
+int xc_domain_maximum_gpfn(xc_interface *xch, domid_t domid);
int xc_domain_increase_reservation(xc_interface *xch,
uint32_t domid,
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home