# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1318498329 -3600
# Node ID ae737bfccb2e584ec29ed0de9a8f3c3e0b9cfee6
# Parent 0345e59b99b7a281b62b3d8bfc001a1508ef2f97
libxl: libxl__e820_alloc must take a libxl__gc.
Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
diff -r 0345e59b99b7 -r ae737bfccb2e tools/libxl/libxl_create.c
--- a/tools/libxl/libxl_create.c Thu Oct 13 10:32:08 2011 +0100
+++ b/tools/libxl/libxl_create.c Thu Oct 13 10:32:09 2011 +0100
@@ -601,7 +601,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 0345e59b99b7 -r ae737bfccb2e tools/libxl/libxl_internal.h
--- a/tools/libxl/libxl_internal.h Thu Oct 13 10:32:08 2011 +0100
+++ b/tools/libxl/libxl_internal.h Thu Oct 13 10:32:09 2011 +0100
@@ -424,7 +424,7 @@ _hidden int libxl__file_reference_map(li
_hidden int libxl__file_reference_unmap(libxl_file_reference *f);
_hidden int libxl__fd_set_cloexec(int fd);
-_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);
/* parse the string @s as a sequence of 6 colon separated bytes in to @mac */
_hidden int libxl__parse_mac(const char *s, libxl_mac mac);
diff -r 0345e59b99b7 -r ae737bfccb2e tools/libxl/libxl_pci.c
--- a/tools/libxl/libxl_pci.c Thu Oct 13 10:32:08 2011 +0100
+++ b/tools/libxl/libxl_pci.c Thu Oct 13 10:32:09 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