From: Wei Liu <wei.liu2@citrix.com>
Date: Thu, 29 Dec 2016 16:36:31 +0000 (+0000)
Subject: libxl: fix libxl_set_memory_target
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~3069
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ed5f19aea66fe5a72060d6a795ffcd23b7643ee3;p=xen.git

libxl: fix libxl_set_memory_target

Commit 26dbc93a ("libxl: Remove pointless hypercall from
libxl_set_memory_target") removed the call to xc_domain_getinfolist, but
it failed to notice that "info" was actually needed later.

Put that back. While at it, make the code conform to coding style
requirement.

Reported-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---

diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c
index 6fd4fe1897..2f83731a8b 100644
--- a/tools/libxl/libxl.c
+++ b/tools/libxl/libxl.c
@@ -4308,6 +4308,13 @@ retry_transaction:
     libxl__xs_printf(gc, t, GCSPRINTF("%s/memory/target", dompath),
                      "%"PRIu64, new_target_memkb);
 
+    r = xc_domain_getinfolist(ctx->xch, domid, 1, &info);
+    if (r != 1 || info.domain != domid) {
+        abort_transaction = 1;
+        rc = ERROR_FAIL;
+        goto out;
+    }
+
     libxl_dominfo_init(&ptr);
     xcinfo2xlinfo(ctx, &info, &ptr);
     uuid = libxl__uuid2string(gc, ptr.uuid);