]> xenbits.xensource.com Git - xen.git/commitdiff
libxl: make set_memory_target work on domains with no videoram
authorKeir Fraser <keir.fraser@citrix.com>
Tue, 4 May 2010 11:36:30 +0000 (12:36 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Tue, 4 May 2010 11:36:30 +0000 (12:36 +0100)
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 <jeremy.fitzhardinge@citrix.com>
tools/libxl/libxl.c

index 43fdec0eaba8de7e0b8135c3d6d23e0135f8c1ff..3a9f3d091e9ffbe5d715f5eaee192d10887a7de5 100644 (file)
@@ -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);