From: Keir Fraser Date: Tue, 4 May 2010 11:36:30 +0000 (+0100) Subject: libxl: make set_memory_target work on domains with no videoram X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~12274 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=15fb9e3a4e7de1344e596fd46e31fae9656fe5a4;p=xen.git libxl: make set_memory_target work on domains with no videoram If a domain has no videoram (say, dom0), then treat the size as 0 and continue, rather than just failing. Signed-off-by: Jeremy Fitzhardinge --- diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 43fdec0eab..3a9f3d091e 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -2292,9 +2292,7 @@ int libxl_set_memory_target(struct libxl_ctx *ctx, uint32_t domid, uint32_t targ char *dompath = libxl_xs_get_dompath(ctx, domid); videoram_s = libxl_xs_read(ctx, XBT_NULL, libxl_sprintf(ctx, "%s/memory/videoram", dompath)); - if (!videoram_s) - return -1; - videoram = atoi(videoram_s); + videoram = videoram_s ? atoi(videoram_s) : 0; libxl_xs_write(ctx, XBT_NULL, libxl_sprintf(ctx, "%s/memory/target", dompath), "%lu", target_memkb); rc = xc_domain_setmaxmem(ctx->xch, domid, target_memkb + LIBXL_MAXMEM_CONSTANT);