From 0630892fafe87ff5e3b65422d38158de46db3ed0 Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Sun, 12 Jun 2016 15:09:50 +0100 Subject: [PATCH] libxl: fix an error path that uses uninitialised rc in libxl_set_memory_target ecdc6fd8 ("libxl: Fix libxl_set_memory_target return value") failed to initialised rc in one failure path. Fix it in this patch. Also fixed an indentation issue while I was there. CID: 1362695 Signed-off-by: Wei Liu Acked-by: Ian Jackson --- tools/libxl/libxl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 5ec4c80249..1c81239303 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -4927,10 +4927,12 @@ retry_transaction: target = libxl__xs_read(gc, t, GCSPRINTF("%s/memory/target", dompath)); if (!target && !domid) { - if (!xs_transaction_end(ctx->xsh, t, 1)) + if (!xs_transaction_end(ctx->xsh, t, 1)) { + rc = ERROR_FAIL; goto out_no_transaction; + } lrc = libxl__fill_dom0_memory_info(gc, ¤t_target_memkb, - ¤t_max_memkb); + ¤t_max_memkb); if (lrc < 0) { rc = ERROR_FAIL; goto out_no_transaction; } goto retry_transaction; } else if (!target) { -- 2.39.5