From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Magenheimer Subject: [PATCH] xen-tmem-list-parse: fix ugly parse output Date: Thu, 1 Nov 2012 09:42:52 -0700 (PDT) Message-ID: <38bc9a60-827c-41f8-a667-e08960b8c135@default> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="__1351788176109146638abhmt102.oracle.com" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian Campbell , Ian Jackson Cc: xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org --__1351788176109146638abhmt102.oracle.com Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Hmmm... It appears I never posted the corrected version of this patch so it never made it upstream. See: http://lists.xen.org/archives/html/xen-devel/2011-11/msg00587.html=20 http://lists.xen.org/archives/html/xen-devel/2011-11/msg02145.html=20 It would be good if this very minor fix was also applied to 4.2 (and, if possible, 4.1). Thanks, Dan =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D The program xen-tmem-list-parse parses the output of xm/xl tmem-list into human-readable format. A missing NULL terminator sometimes causes garbage to be spewed where the two-letter pool type should be output. Signed-off-by: Dan Magenheimer --- tools/misc/xen-tmem-list-parse.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/misc/xen-tmem-list-parse.c b/tools/misc/xen-tmem-list-pa= rse.c index 977e4d3..f32b107 100644 --- a/tools/misc/xen-tmem-list-parse.c +++ b/tools/misc/xen-tmem-list-parse.c @@ -243,6 +243,7 @@ void parse_pool(char *s) unsigned long long flush_objs =3D parse(s,"ot"); =20 parse_string(s,"PT",pool_type,2); + pool_type[2] =3D '\0'; if (pool_type[1] =3D=3D 'S') return; /* no need to repeat print data for shared pools */ printf("domid%lu,id%lu[%s]:pgp=3D%llu(max=3D%llu) obj=3D%llu(%llu) " @@ -286,6 +287,7 @@ void parse_shared_pool(char *s) unsigned long long flush_objs =3D parse(s,"ot"); =20 parse_string(s,"PT",pool_type,2); + pool_type[2] =3D '\0'; parse_sharers(s,"SC",buf,BUFSIZE); printf("poolid=3D%lu[%s] uuid=3D%llx.%llx, shared-by:%s: " "pgp=3D%llu(max=3D%llu) obj=3D%llu(%llu) " --=20 1.7.1 --__1351788176109146638abhmt102.oracle.com Content-Type: application/octet-stream; name="0001-Fix-ugly-parse-output-for-xen-tmem-list-parse.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="0001-Fix-ugly-parse-output-for-xen-tmem-list-parse.patch" RnJvbTogRGFuIE1hZ2VuaGVpbWVyIDxkYW4ubWFnZW5oZWltZXJAb3JhY2xlLmNvbT4KRGF0ZTog VGh1LCAxIE5vdiAyMDEyIDEwOjI0OjU2IC0wNjAwClN1YmplY3Q6IFtQQVRDSF0gRml4IHVnbHkg cGFyc2Ugb3V0cHV0IGZvciB4ZW4tdG1lbS1saXN0LXBhcnNlCgpUaGUgcHJvZ3JhbSB4ZW4tdG1l bS1saXN0LXBhcnNlIHBhcnNlcyB0aGUgb3V0cHV0IG9mIHhtL3hsIHRtZW0tbGlzdAppbnRvIGh1 bWFuLXJlYWRhYmxlIGZvcm1hdC4gIEEgbWlzc2luZyBOVUxMIHRlcm1pbmF0b3Igc29tZXRpbWVz CmNhdXNlcyBnYXJiYWdlIHRvIGJlIHNwZXdlZCB3aGVyZSB0aGUgdHdvLWxldHRlciBwb29sIHR5 cGUKc2hvdWxkIGJlIG91dHB1dC4KClNpZ25lZC1vZmYtYnk6IERhbiBNYWdlbmhlaW1lciA8ZGFu Lm1hZ2VuaGVpbWVyQG9yYWNsZS5jb20+Ci0tLQogdG9vbHMvbWlzYy94ZW4tdG1lbS1saXN0LXBh cnNlLmMgfCAgICAyICsrCiAxIGZpbGVzIGNoYW5nZWQsIDIgaW5zZXJ0aW9ucygrKSwgMCBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS90b29scy9taXNjL3hlbi10bWVtLWxpc3QtcGFyc2UuYyBi L3Rvb2xzL21pc2MveGVuLXRtZW0tbGlzdC1wYXJzZS5jCmluZGV4IDk3N2U0ZDMuLmYzMmIxMDcg MTAwNjQ0Ci0tLSBhL3Rvb2xzL21pc2MveGVuLXRtZW0tbGlzdC1wYXJzZS5jCisrKyBiL3Rvb2xz L21pc2MveGVuLXRtZW0tbGlzdC1wYXJzZS5jCkBAIC0yNDMsNiArMjQzLDcgQEAgdm9pZCBwYXJz ZV9wb29sKGNoYXIgKnMpCiAgICAgdW5zaWduZWQgbG9uZyBsb25nIGZsdXNoX29ianMgPSBwYXJz ZShzLCJvdCIpOwogCiAgICAgcGFyc2Vfc3RyaW5nKHMsIlBUIixwb29sX3R5cGUsMik7CisgICAg cG9vbF90eXBlWzJdID0gJ1wwJzsKICAgICBpZiAocG9vbF90eXBlWzFdID09ICdTJykKICAgICAg ICAgcmV0dXJuOyAvKiBubyBuZWVkIHRvIHJlcGVhdCBwcmludCBkYXRhIGZvciBzaGFyZWQgcG9v bHMgKi8KICAgICBwcmludGYoImRvbWlkJWx1LGlkJWx1WyVzXTpwZ3A9JWxsdShtYXg9JWxsdSkg b2JqPSVsbHUoJWxsdSkgIgpAQCAtMjg2LDYgKzI4Nyw3IEBAIHZvaWQgcGFyc2Vfc2hhcmVkX3Bv b2woY2hhciAqcykKICAgICB1bnNpZ25lZCBsb25nIGxvbmcgZmx1c2hfb2JqcyA9IHBhcnNlKHMs Im90Iik7CiAKICAgICBwYXJzZV9zdHJpbmcocywiUFQiLHBvb2xfdHlwZSwyKTsKKyAgICBwb29s X3R5cGVbMl0gPSAnXDAnOwogICAgIHBhcnNlX3NoYXJlcnMocywiU0MiLGJ1ZixCVUZTSVpFKTsK ICAgICBwcmludGYoInBvb2xpZD0lbHVbJXNdIHV1aWQ9JWxseC4lbGx4LCBzaGFyZWQtYnk6JXM6 ICIKICAgICAgICAgICAgInBncD0lbGx1KG1heD0lbGx1KSBvYmo9JWxsdSglbGx1KSAiCi0tIAox LjcuMQoK --__1351788176109146638abhmt102.oracle.com Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xen.org http://lists.xen.org/xen-devel --__1351788176109146638abhmt102.oracle.com--