# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1316609966 -3600
# Node ID 0bde6820ca0c4a9152a8650a156c6c9b97c5f639
# Parent abbbe6c4abcc57ae90090a05d4bbf338e05693e5
libxl: libxl__e820_alloc must take a libxl__gc.
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
diff -r abbbe6c4abcc -r 0bde6820ca0c tools/libxl/libxl_create.c
--- a/tools/libxl/libxl_create.c Wed Sep 21 13:59:26 2011 +0100
+++ b/tools/libxl/libxl_create.c Wed Sep 21 13:59:26 2011 +0100
@@ -599,7 +599,7 @@ static int do_domain_create(libxl__gc *g
if (d_config->c_info.type == LIBXL_DOMAIN_TYPE_PV &&
d_config->b_info.u.pv.e820_host) {
int rc;
- rc = libxl__e820_alloc(ctx, domid, d_config);
+ rc = libxl__e820_alloc(gc, domid, d_config);
if (rc)
LIBXL__LOG_ERRNO(ctx, LIBXL__LOG_ERROR,
"Failed while collecting E820 with: %d (errno:%d)\n",
diff -r abbbe6c4abcc -r 0bde6820ca0c tools/libxl/libxl_internal.h
--- a/tools/libxl/libxl_internal.h Wed Sep 21 13:59:26 2011 +0100
+++ b/tools/libxl/libxl_internal.h Wed Sep 21 13:59:26 2011 +0100
@@ -398,7 +398,7 @@ _hidden int libxl__error_set(libxl__gc *
_hidden int libxl__file_reference_map(libxl_file_reference *f);
_hidden int libxl__file_reference_unmap(libxl_file_reference *f);
-_hidden int libxl__e820_alloc(libxl_ctx *ctx, uint32_t domid,
libxl_domain_config *d_config);
+_hidden int libxl__e820_alloc(libxl__gc *gc, uint32_t domid,
libxl_domain_config *d_config);
#define STRINGIFY(x) #x
#define TOSTRING(x) STRINGIFY(x)
diff -r abbbe6c4abcc -r 0bde6820ca0c tools/libxl/libxl_pci.c
--- a/tools/libxl/libxl_pci.c Wed Sep 21 13:59:26 2011 +0100
+++ b/tools/libxl/libxl_pci.c Wed Sep 21 13:59:26 2011 +0100
@@ -1269,8 +1269,9 @@ static int e820_sanitize(libxl_ctx *ctx,
return 0;
}
-int libxl__e820_alloc(libxl_ctx *ctx, uint32_t domid, libxl_domain_config
*d_config)
+int libxl__e820_alloc(libxl__gc *gc, uint32_t domid, libxl_domain_config
*d_config)
{
+ libxl_ctx *ctx = libxl__gc_owner(gc);
int rc;
uint32_t nr;
struct e820entry map[E820MAX];
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
Home