From: Keir Fraser Date: Tue, 11 May 2010 07:39:01 +0000 (+0100) Subject: libxl: More cpupool fixes. X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~12199 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0e13089b1456e71c99005caa7d4b78ba34656337;p=xen.git libxl: More cpupool fixes. Signed-off-by: Juergen Gross --- diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 13fbe3684a..4ddcfe868f 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -169,7 +169,8 @@ retry_transaction: xs_write(ctx->xsh, t, libxl_sprintf(ctx, "%s/uuid", vm_path), uuid_string, strlen(uuid_string)); xs_write(ctx->xsh, t, libxl_sprintf(ctx, "%s/name", vm_path), info->name, strlen(info->name)); - xs_write(ctx->xsh, t, libxl_sprintf(ctx, "%s/pool_name", vm_path), info->poolname, strlen(info->poolname)); + if (info->poolname) + xs_write(ctx->xsh, t, libxl_sprintf(ctx, "%s/pool_name", vm_path), info->poolname, strlen(info->poolname)); libxl_xs_writev(ctx, t, dom_path, info->xsdata); libxl_xs_writev(ctx, t, libxl_sprintf(ctx, "%s/platform", dom_path), info->platformdata); diff --git a/tools/libxl/libxl_utils.c b/tools/libxl/libxl_utils.c index 08fa2ca909..7e76e202a6 100644 --- a/tools/libxl/libxl_utils.c +++ b/tools/libxl/libxl_utils.c @@ -84,6 +84,8 @@ char *libxl_poolid_to_name(struct libxl_ctx *ctx, uint32_t poolid) char path[strlen("/local/pool") + 12]; char *s; + if (poolid == 0) + return "Pool-0"; snprintf(path, sizeof(path), "/local/pool/%d/name", poolid); s = xs_read(ctx->xsh, XBT_NULL, path, &len); libxl_ptr_add(ctx, s);