diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2011-10-13 10:32:09 +0100 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2011-10-13 10:32:09 +0100 |
| commit | 10befefe28405f9c439066a64625738be3fd38f9 (patch) | |
| tree | eb5d1768a281005e6e010ba8815d01cbca53f6d4 /tools | |
| parent | 5d7156463e061da767f8b10dfc57fefb50d65eb4 (diff) | |
| download | xen-10befefe28405f9c439066a64625738be3fd38f9.tar.gz xen-10befefe28405f9c439066a64625738be3fd38f9.tar.bz2 xen-10befefe28405f9c439066a64625738be3fd38f9.zip | |
libxl: libxl__e820_alloc must take a libxl__gc.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson.citrix.com>
Committed-by: Ian Jackson <ian.jackson.citrix.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/libxl/libxl_create.c | 2 | ||||
| -rw-r--r-- | tools/libxl/libxl_internal.h | 2 | ||||
| -rw-r--r-- | tools/libxl/libxl_pci.c | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c index 5716f8225f..68d0fc398a 100644 --- a/tools/libxl/libxl_create.c +++ b/tools/libxl/libxl_create.c @@ -601,7 +601,7 @@ static int do_domain_create(libxl__gc *gc, libxl_domain_config *d_config, 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 --git a/tools/libxl/libxl_internal.h b/tools/libxl/libxl_internal.h index f8cdd1b657..2e26ac69a3 100644 --- a/tools/libxl/libxl_internal.h +++ b/tools/libxl/libxl_internal.h @@ -424,7 +424,7 @@ _hidden int libxl__file_reference_map(libxl_file_reference *f); _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 --git a/tools/libxl/libxl_pci.c b/tools/libxl/libxl_pci.c index 84a3647815..842d5b0463 100644 --- a/tools/libxl/libxl_pci.c +++ b/tools/libxl/libxl_pci.c @@ -1269,8 +1269,9 @@ static int e820_sanitize(libxl_ctx *ctx, struct e820entry src[], 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]; |