[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Xen-devel] [PATCH] libxl_json: Fix backport of JSON_BOOL to 4.2.2



Looks like I made an error backporting here, which is odd as I thought
this applied directly. I've checked the original hg patches I
was working from and there's no obvious reason for the difference. Sorry.

Whilst Don's fix is right in that obj->u.b should be set, I note that
4.3 does not check the error return from libxl__json_object_alloc
whereas 4.2 does. Given libxl__json_object_alloc itself may
SEGV if libxl__zalloc fails, this should not matter.

Acked-By from me below.

Alex


--On 5 July 2013 11:11:45 -0400 Don Slutz <dslutz@xxxxxxxxxxx> wrote:

Commit 2b3072ed0cbeed8c0385f20e92ba0f1201db8a17 has the setting of
obj->u.b Commit 6a2aca9fdef0499e613715baf107f2296b9007cf does not.

This shows up by vnc-port and vnc-listen are missing in xenstore when
they should not be.

Signed-off-by: Don Slutz <dslutz@xxxxxxxxxxx>
Acked-By: Alex Bligh <alex@xxxxxxxxxxx>
---
 tools/libxl/libxl_json.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/tools/libxl/libxl_json.c b/tools/libxl/libxl_json.c
index 72b52e8..0810630 100644
--- a/tools/libxl/libxl_json.c
+++ b/tools/libxl/libxl_json.c
@@ -474,6 +474,7 @@ static int json_callback_boolean(void *opaque, int
boolean)
     if ((obj = libxl__json_object_alloc(ctx->gc, JSON_BOOL)) == NULL)
         return 0;
+    obj->u.b = boolean;

     if (libxl__json_object_append_to(ctx->gc, obj, ctx->current) == -1) {
         libxl__json_object_free(ctx->gc, obj);
--
1.7.1


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel





--
Alex Bligh

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel


 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.