* [PATCH] libxl_json: Fix backport of JSON_BOOL to 4.2.2 @ 2013-07-05 15:11 Don Slutz 2013-07-05 15:30 ` Don Slutz 2013-07-06 13:19 ` Alex Bligh 0 siblings, 2 replies; 7+ messages in thread From: Don Slutz @ 2013-07-05 15:11 UTC (permalink / raw) To: xen-devel, anthony.perard, ian.campbell, alex, jbeulich, Ian.Jackson Cc: Don Slutz 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@verizon.com> --- 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 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] libxl_json: Fix backport of JSON_BOOL to 4.2.2 2013-07-05 15:11 [PATCH] libxl_json: Fix backport of JSON_BOOL to 4.2.2 Don Slutz @ 2013-07-05 15:30 ` Don Slutz 2013-07-05 20:29 ` Konrad Rzeszutek Wilk 2013-07-06 13:19 ` Alex Bligh 1 sibling, 1 reply; 7+ messages in thread From: Don Slutz @ 2013-07-05 15:30 UTC (permalink / raw) To: Don Slutz Cc: ian.campbell, alex, Ian.Jackson, xen-devel, jbeulich, anthony.perard Looks like I had an issue with the mailer I used, and this did not get to anyone at citrix.com. Resending via a different SMTP server. -Don Slutz On 07/05/13 11:11, Don Slutz 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@verizon.com> > --- > 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); ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] libxl_json: Fix backport of JSON_BOOL to 4.2.2 2013-07-05 15:30 ` Don Slutz @ 2013-07-05 20:29 ` Konrad Rzeszutek Wilk 2013-07-05 20:40 ` Don Slutz 0 siblings, 1 reply; 7+ messages in thread From: Konrad Rzeszutek Wilk @ 2013-07-05 20:29 UTC (permalink / raw) To: Don Slutz Cc: ian.campbell, alex, Ian.Jackson, xen-devel, jbeulich, anthony.perard Don Slutz <dslutz@verizon.com> wrote: >Looks like I had an issue with the mailer I used, and this did not get >to anyone at citrix.com. Resending via a different SMTP server. > -Don Slutz > >On 07/05/13 11:11, Don Slutz 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@verizon.com> >> --- >> 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); > > >_______________________________________________ >Xen-devel mailing list >Xen-devel@lists.xen.org >http://lists.xen.org/xen-devel Could you also include in the commit description not just the git commit id but also also the title of said patches? Thanks -- Sent from my Android phone. Please excuse my brevity. ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] libxl_json: Fix backport of JSON_BOOL to 4.2.2 2013-07-05 20:29 ` Konrad Rzeszutek Wilk @ 2013-07-05 20:40 ` Don Slutz 2013-07-05 21:09 ` Konrad Rzeszutek Wilk 0 siblings, 1 reply; 7+ messages in thread From: Don Slutz @ 2013-07-05 20:40 UTC (permalink / raw) To: Konrad Rzeszutek Wilk Cc: jbeulich, Ian.Jackson, Don Slutz, xen-devel, alex, anthony.perard, ian.campbell On 07/05/13 16:29, Konrad Rzeszutek Wilk wrote: > Don Slutz <dslutz@verizon.com> wrote: > >> Looks like I had an issue with the mailer I used, and this did not get >> to anyone at citrix.com. Resending via a different SMTP server. >> -Don Slutz >> >> On 07/05/13 11:11, Don Slutz 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@verizon.com> >>> --- >>> 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); >> >> _______________________________________________ >> Xen-devel mailing list >> Xen-devel@lists.xen.org >> http://lists.xen.org/xen-devel > Could you also include in the commit description not just the git commit id but also also the title of said patches? Thanks How does this look: Commit 2b3072ed0cbeed8c0385f20e92ba0f1201db8a17 has the setting of obj->u.b libxl_json: Replace JSON_TRUE/FALSE by JSON_BOOL. Commit 6a2aca9fdef0499e613715baf107f2296b9007cf does not. libxl_json: Replace JSON_TRUE/FALSE by JSON_BOOL. This shows up by vnc-port and vnc-listen are missing in xenstore when they should not be. for the commit message? -Don Slutz ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] libxl_json: Fix backport of JSON_BOOL to 4.2.2 2013-07-05 20:40 ` Don Slutz @ 2013-07-05 21:09 ` Konrad Rzeszutek Wilk 2013-07-08 13:57 ` Don Slutz 0 siblings, 1 reply; 7+ messages in thread From: Konrad Rzeszutek Wilk @ 2013-07-05 21:09 UTC (permalink / raw) To: Don Slutz Cc: ian.campbell, alex, Ian.Jackson, xen-devel, jbeulich, anthony.perard Don Slutz <dslutz@verizon.com> wrote: >On 07/05/13 16:29, Konrad Rzeszutek Wilk wrote: >> Don Slutz <dslutz@verizon.com> wrote: >> >>> Looks like I had an issue with the mailer I used, and this did not >get >>> to anyone at citrix.com. Resending via a different SMTP server. >>> -Don Slutz >>> >>> On 07/05/13 11:11, Don Slutz 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@verizon.com> >>>> --- >>>> 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); >>> >>> _______________________________________________ >>> Xen-devel mailing list >>> Xen-devel@lists.xen.org >>> http://lists.xen.org/xen-devel >> Could you also include in the commit description not just the git >commit id but also also the title of said patches? Thanks >How does this look: > > Commit 2b3072ed0cbeed8c0385f20e92ba0f1201db8a17 has the setting of >obj->u.b > libxl_json: Replace JSON_TRUE/FALSE by JSON_BOOL. > > Commit 6a2aca9fdef0499e613715baf107f2296b9007cf does not. > libxl_json: Replace JSON_TRUE/FALSE by JSON_BOOL. > > This shows up by vnc-port and vnc-listen are missing in xenstore >when they should not be. > >for the commit message? > -Don Slutz I don't have my git tree in front of me but are you sure that both git commits have the same title. That would be pretty odd. Anyhow I usually just include the title right after the commit as: git commit xyz ('title of said patch'). -- Sent from my Android phone. Please excuse my brevity. ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] libxl_json: Fix backport of JSON_BOOL to 4.2.2 2013-07-05 21:09 ` Konrad Rzeszutek Wilk @ 2013-07-08 13:57 ` Don Slutz 0 siblings, 0 replies; 7+ messages in thread From: Don Slutz @ 2013-07-08 13:57 UTC (permalink / raw) To: Konrad Rzeszutek Wilk Cc: jbeulich, Ian.Jackson, Don Slutz, xen-devel, alex, anthony.perard, ian.campbell [-- Attachment #1: Type: text/plain, Size: 2559 bytes --] On 07/05/13 17:09, Konrad Rzeszutek Wilk wrote: > Don Slutz <dslutz@verizon.com> wrote: > >> On 07/05/13 16:29, Konrad Rzeszutek Wilk wrote: >>> Don Slutz <dslutz@verizon.com> wrote: >>> >>>> Looks like I had an issue with the mailer I used, and this did not >> get >>>> to anyone at citrix.com. Resending via a different SMTP server. >>>> -Don Slutz >>>> >>>> On 07/05/13 11:11, Don Slutz 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@verizon.com> >>>>> --- >>>>> 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); >>>> _______________________________________________ >>>> Xen-devel mailing list >>>> Xen-devel@lists.xen.org >>>> http://lists.xen.org/xen-devel >>> Could you also include in the commit description not just the git >> commit id but also also the title of said patches? Thanks >> How does this look: >> >> Commit 2b3072ed0cbeed8c0385f20e92ba0f1201db8a17 has the setting of >> obj->u.b >> libxl_json: Replace JSON_TRUE/FALSE by JSON_BOOL. >> >> Commit 6a2aca9fdef0499e613715baf107f2296b9007cf does not. >> libxl_json: Replace JSON_TRUE/FALSE by JSON_BOOL. >> >> This shows up by vnc-port and vnc-listen are missing in xenstore >> when they should not be. >> >> for the commit message? >> -Don Slutz > I don't have my git tree in front of me but are you sure that both git commits have the same title. That would be pretty odd. > > Anyhow I usually just include the title right after the commit as: git commit xyz ('title of said patch'). I have attached a v2 of the commit message (including the Acked-By: Alex Bligh) and the 2 git commit messages referred to. I can top post the v2 if needed. -Don Slutz [-- Attachment #2: 0001-libxl_json-Fix-backport-of-JSON_BOOL-to-4.2.2.patch --] [-- Type: text/plain, Size: 1317 bytes --] From 228886732763fd06ecfabb17d1a2f947ab303a2a Mon Sep 17 00:00:00 2001 From: Don Slutz <dslutz@verizon.com> Date: Fri, 5 Jul 2013 10:58:48 -0400 Subject: [PATCH] libxl_json: Fix backport of JSON_BOOL to 4.2.2 git commit 2b3072ed0cbeed8c0385f20e92ba0f1201db8a17 ('libxl_json: Replace JSON_TRUE/FALSE by JSON_BOOL.') has the setting of obj->u.b git commit 6a2aca9fdef0499e613715baf107f2296b9007cf ('libxl_json: Replace JSON_TRUE/FALSE by JSON_BOOL.') 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@verizon.com> Acked-By: Alex Bligh <alex@alex.org.uk> --- v1 -> v2 Adjust commit message as Konrad Rzeszutek Wilk sugested. Add Alex Bligh's Acked-By 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 [-- Attachment #3: commit-2b3072ed0cbeed8c0385f20e92ba0f1201db8a17.txt --] [-- Type: text/plain, Size: 487 bytes --] commit 2b3072ed0cbeed8c0385f20e92ba0f1201db8a17 Author: Anthony PERARD <anthony.perard@citrix.com> Date: Mon Oct 8 11:45:31 2012 +0100 libxl_json: Replace JSON_TRUE/FALSE by JSON_BOOL. Those two JSON_TRUE and JSON_FALSE were types of node. But it's better to have a unique JSON_BOOL type. Signed-off-by: Anthony PERARD <anthony.perard@citrix.com> Acked-by: Ian Campbell <ian.campbell@citrix.com> Committed-by: Ian Campbell <ian.campbell@citrix.com> [-- Attachment #4: commit-6a2aca9fdef0499e613715baf107f2296b9007cf.txt --] [-- Type: text/plain, Size: 671 bytes --] commit 6a2aca9fdef0499e613715baf107f2296b9007cf Author: Alex Bligh <alex@alex.org.uk> Date: Tue Feb 19 15:25:13 2013 +0000 libxl_json: Replace JSON_TRUE/FALSE by JSON_BOOL. Those two JSON_TRUE and JSON_FALSE were types of node. But it's better to have a unique JSON_BOOL type. Backported from xen-unstable patch: : HG changeset patch : User Anthony PERARD <anthony.perard@citrix.com> : Date 1349693131 -3600 : Node ID 3f71aab0e2774ded0c5a03436c364fb031ba9aa0 : Parent 4a6d5d8cba4fc44f9bbda201188885868604b8e8 Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <Ian.Jackson@eu.citrix.com> [-- Attachment #5: Type: text/plain, Size: 126 bytes --] _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] libxl_json: Fix backport of JSON_BOOL to 4.2.2 2013-07-05 15:11 [PATCH] libxl_json: Fix backport of JSON_BOOL to 4.2.2 Don Slutz 2013-07-05 15:30 ` Don Slutz @ 2013-07-06 13:19 ` Alex Bligh 1 sibling, 0 replies; 7+ messages in thread From: Alex Bligh @ 2013-07-06 13:19 UTC (permalink / raw) To: xen-devel, anthony.perard, ian.campbell, jbeulich, Ian.Jackson Cc: Alex Bligh, Don Slutz 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@verizon.com> 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@verizon.com> Acked-By: Alex Bligh <alex@alex.org.uk> > --- > 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@lists.xen.org > http://lists.xen.org/xen-devel > > -- Alex Bligh ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-07-08 13:57 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-07-05 15:11 [PATCH] libxl_json: Fix backport of JSON_BOOL to 4.2.2 Don Slutz 2013-07-05 15:30 ` Don Slutz 2013-07-05 20:29 ` Konrad Rzeszutek Wilk 2013-07-05 20:40 ` Don Slutz 2013-07-05 21:09 ` Konrad Rzeszutek Wilk 2013-07-08 13:57 ` Don Slutz 2013-07-06 13:19 ` Alex Bligh
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).