From 5301fe9943e8d6b4bee5fb8739775450ac3cbde4 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Mon, 20 Jul 2009 15:45:50 +0100 Subject: libxenguest: Revert domain builder interface changes for 'superpages' parameter, and place the flag in a pad byte of 'struct xc_dom_image' instead. Signed-off-by: Keir Fraser --- tools/libxc/xc_dom_compat_linux.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'tools/libxc/xc_dom_compat_linux.c') diff --git a/tools/libxc/xc_dom_compat_linux.c b/tools/libxc/xc_dom_compat_linux.c index 41ee3af634..c00cd5abcd 100644 --- a/tools/libxc/xc_dom_compat_linux.c +++ b/tools/libxc/xc_dom_compat_linux.c @@ -28,8 +28,7 @@ static int xc_linux_build_internal(struct xc_dom_image *dom, unsigned int store_evtchn, unsigned long *store_mfn, unsigned int console_evtchn, - unsigned long *console_mfn, - int superpages) + unsigned long *console_mfn) { int rc; @@ -43,7 +42,7 @@ static int xc_linux_build_internal(struct xc_dom_image *dom, goto out; if ( (rc = xc_dom_mem_init(dom, mem_mb)) != 0 ) goto out; - if ( (rc = xc_dom_boot_mem_init(dom, superpages)) != 0 ) + if ( (rc = xc_dom_boot_mem_init(dom)) != 0 ) goto out; if ( (rc = xc_dom_build_image(dom)) != 0 ) goto out; @@ -68,8 +67,8 @@ int xc_linux_build_mem(int xc_handle, uint32_t domid, unsigned long flags, unsigned int store_evtchn, unsigned long *store_mfn, - unsigned int console_evtchn, unsigned long *console_mfn, - int superpages) + unsigned int console_evtchn, + unsigned long *console_mfn) { struct xc_dom_image *dom; int rc; @@ -84,7 +83,7 @@ int xc_linux_build_mem(int xc_handle, uint32_t domid, rc = xc_linux_build_internal(dom, xc_handle, domid, mem_mb, flags, store_evtchn, store_mfn, - console_evtchn, console_mfn, superpages); + console_evtchn, console_mfn); out: xc_dom_release(dom); @@ -100,8 +99,8 @@ int xc_linux_build(int xc_handle, uint32_t domid, unsigned long flags, unsigned int store_evtchn, unsigned long *store_mfn, - unsigned int console_evtchn, unsigned long *console_mfn, - int superpages) + unsigned int console_evtchn, + unsigned long *console_mfn) { struct xc_dom_image *dom; int rc; @@ -117,7 +116,7 @@ int xc_linux_build(int xc_handle, uint32_t domid, rc = xc_linux_build_internal(dom, xc_handle, domid, mem_mb, flags, store_evtchn, store_mfn, - console_evtchn, console_mfn, superpages); + console_evtchn, console_mfn); out: xc_dom_release(dom); @@ -133,8 +132,7 @@ int xc_dom_linux_build(int xc_handle, unsigned long flags, unsigned int store_evtchn, unsigned long *store_mfn, - unsigned int console_evtchn, unsigned long *console_mfn, - int superpages) + unsigned int console_evtchn, unsigned long *console_mfn) { int rc; @@ -147,7 +145,7 @@ int xc_dom_linux_build(int xc_handle, return xc_linux_build_internal(dom, xc_handle, domid, mem_mb, flags, store_evtchn, store_mfn, - console_evtchn, console_mfn, superpages); + console_evtchn, console_mfn); } /* -- cgit v1.2.3