From: Ian Campbell Date: Mon, 16 Aug 2010 14:31:05 +0000 (+0100) Subject: libxl: do not GC data returned to the caller by libxl_device_disk_getinfo. X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~11622 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e04488a1f90075212ad733c9df22c923ef9d4c57;p=xen.git libxl: do not GC data returned to the caller by libxl_device_disk_getinfo. Signed-off-by: Ian Campbell Signed-off-by: Stefano Stabellini committer: Stefano Stabellini --- diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 9638c1676d..d96743bab9 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -2501,8 +2501,8 @@ int libxl_device_disk_getinfo(libxl_ctx *ctx, uint32_t domid, /* tap devices entries in xenstore are written as vbd devices. */ diskpath = libxl_sprintf(&gc, "%s/device/vbd/%d", dompath, diskinfo->devid); - diskinfo->backend = libxl_xs_read(&gc, XBT_NULL, - libxl_sprintf(&gc, "%s/backend", diskpath)); + diskinfo->backend = xs_read(ctx->xsh, XBT_NULL, + libxl_sprintf(&gc, "%s/backend", diskpath), NULL); if (!diskinfo->backend) { libxl_free_all(&gc); return ERROR_FAIL; @@ -2515,8 +2515,8 @@ int libxl_device_disk_getinfo(libxl_ctx *ctx, uint32_t domid, diskinfo->evtch = val ? strtoul(val, NULL, 10) : -1; val = libxl_xs_read(&gc, XBT_NULL, libxl_sprintf(&gc, "%s/ring-ref", diskpath)); diskinfo->rref = val ? strtoul(val, NULL, 10) : -1; - diskinfo->frontend = libxl_xs_read(&gc, XBT_NULL, - libxl_sprintf(&gc, "%s/frontend", diskinfo->backend)); + diskinfo->frontend = xs_read(ctx->xsh, XBT_NULL, + libxl_sprintf(&gc, "%s/frontend", diskinfo->backend), NULL); val = libxl_xs_read(&gc, XBT_NULL, libxl_sprintf(&gc, "%s/frontend-id", diskinfo->backend)); diskinfo->frontend_id = val ? strtoul(val, NULL, 10) : -1;