From patchwork Fri Mar 25 13:25:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Rzeszutek Wilk X-Patchwork-Id: 8671421 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C41F99F326 for ; Fri, 25 Mar 2016 13:28:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BAFF220254 for ; Fri, 25 Mar 2016 13:28:23 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B097F2034A for ; Fri, 25 Mar 2016 13:28:22 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ajRk5-0007G3-Gt; Fri, 25 Mar 2016 13:25:33 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ajRk4-0007Fw-JW for xen-devel@lists.xenproject.org; Fri, 25 Mar 2016 13:25:32 +0000 Received: from [193.109.254.147] by server-14.bemta-14.messagelabs.com id FA/38-02987-B4C35F65; Fri, 25 Mar 2016 13:25:31 +0000 X-Env-Sender: konrad@char.us.oracle.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1458912329!33784525!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjc3MjE4\n X-StarScan-Received: X-StarScan-Version: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 46468 invoked from network); 25 Mar 2016 13:25:30 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-15.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 25 Mar 2016 13:25:30 -0000 Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u2PDPP9v024586 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 25 Mar 2016 13:25:25 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0021.oracle.com (8.13.8/8.13.8) with ESMTP id u2PDPPfD029141 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 25 Mar 2016 13:25:25 GMT Received: from abhmp0004.oracle.com (abhmp0004.oracle.com [141.146.116.10]) by userv0121.oracle.com (8.13.8/8.13.8) with ESMTP id u2PDPOTT021464; Fri, 25 Mar 2016 13:25:24 GMT Received: from char.us.oracle.com (/10.137.176.158) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 25 Mar 2016 06:25:23 -0700 Received: by char.us.oracle.com (Postfix, from userid 1000) id B0FE16A00B7; Fri, 25 Mar 2016 09:25:22 -0400 (EDT) Date: Fri, 25 Mar 2016 09:25:22 -0400 From: Konrad Rzeszutek Wilk To: xen-devel@lists.xenproject.org, ross.lagerwall@citrix.com, konrad@kernel.org, andrew.cooper3@citrix.com, mpohlack@amazon.de, sasha.levin@oracle.com Message-ID: <20160325132522.GA29603@char.us.oracle.com> References: <1458849640-22588-1-git-send-email-konrad.wilk@oracle.com> <1458849640-22588-22-git-send-email-konrad.wilk@oracle.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1458849640-22588-22-git-send-email-konrad.wilk@oracle.com> User-Agent: Mutt/1.5.24 (2015-08-30) X-Source-IP: userv0021.oracle.com [156.151.31.71] Cc: Wei Liu , Ian Jackson , Stefano Stabellini Subject: Re: [Xen-devel] [PATCH v5 21/28] libxl: info: Display build_id of the hypervisor using XEN_VERSION_build_id X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Thu, Mar 24, 2016 at 04:00:33PM -0400, Konrad Rzeszutek Wilk wrote: > If the hypervisor is built with we will display it. > > Signed-off-by: Konrad Rzeszutek Wilk > Acked-by: Wei Liu Hey Wei, It has you Ack, but I think when I carried over the change (it used to be its own function with switch) I messed up the Style: > diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c > index 6c3ec40..310a7f3 100644 > --- a/tools/libxl/libxl.c > +++ b/tools/libxl/libxl.c > @@ -5277,8 +5278,24 @@ const libxl_version_info* libxl_get_version_info(libxl_ctx *ctx) > > info->virt_start = val; > > - (void)libxl__xc_version_wrapper(gc, XEN_VERSION_commandline, buf, > - info->pagesize, &info->commandline); > + if (libxl__xc_version_wrapper(gc, XEN_VERSION_commandline, buf, > + info->pagesize, &info->commandline) < 0) > + goto out; > + > + r = xc_version(ctx->xch, XEN_VERSION_build_id, buf, info->pagesize); > + if (r < 0) > + { > + info->build_id = libxl__strdup(NOGC, ""); > + } > + else if (r > 0) > + { > + unsigned int i; > + > + info->build_id = libxl__zalloc(NOGC, (r * 2) + 1); > + > + for (i = 0; i < r; i++) > + snprintf(&info->build_id[i * 2], 3, "%02hhx", buf[i]); > + } > out: > GC_FREE; > return info; So I fixed it up to be: From bc4ed9d93162325342a37122fcab7223fcd61430 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Fri, 18 Mar 2016 14:56:13 -0400 Subject: [PATCH] libxl: info: Display build_id of the hypervisor using XEN_VERSION_build_id If the hypervisor is built with we will display it. Signed-off-by: Konrad Rzeszutek Wilk Acked-by: Wei Liu --- Cc: Ian Jackson Cc: Stefano Stabellini Cc: Wei Liu v2: Include HAVE_*, use libxl_zalloc, s/rc/ret/ v3: Retry with different size if 1020 is not enough. v4: Use VERSION_OP subops instead of the XENVER_ subops v5: Change it per Wei's review. s/VERSION_OP/VERSION/ And actually use the proper Style! --- tools/libxl/libxl.c | 18 ++++++++++++++++-- tools/libxl/libxl.h | 6 ++++++ tools/libxl/libxl_types.idl | 1 + tools/libxl/xl_cmdimpl.c | 1 + 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 704e7b4..dea5d25 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -5233,6 +5233,7 @@ const libxl_version_info* libxl_get_version_info(libxl_ctx *ctx) GC_INIT(ctx); char *buf; xen_version_op_val_t val = 0; + int r; libxl_version_info *info = &ctx->version_info; if (info->xen_version_extra != NULL) @@ -5275,8 +5276,21 @@ const libxl_version_info* libxl_get_version_info(libxl_ctx *ctx) info->virt_start = val; - (void)libxl__xc_version_wrapper(gc, XEN_VERSION_commandline, buf, - info->pagesize, &info->commandline); + if (libxl__xc_version_wrapper(gc, XEN_VERSION_commandline, buf, + info->pagesize, &info->commandline) < 0) + goto out; + + r = xc_version(ctx->xch, XEN_VERSION_build_id, buf, info->pagesize); + if (r < 0) { + info->build_id = libxl__strdup(NOGC, ""); + } else if (r > 0) { + unsigned int i; + + info->build_id = libxl__zalloc(NOGC, (r * 2) + 1); + + for (i = 0; i < r; i++) + snprintf(&info->build_id[i * 2], 3, "%02hhx", buf[i]); + } out: GC_FREE; return info; diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index f61bc4b..5baffdf 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -230,6 +230,12 @@ #define LIBXL_HAVE_APIC_ASSIST 1 /* + * LIBXL_HAVE_BUILD_ID means that libxl_version_info has the extra + * field for the hypervisor build_id. + */ +#define LIBXL_HAVE_BUILD_ID 1 + +/* * libxl ABI compatibility * * The only guarantee which libxl makes regarding ABI compatibility diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 59b183c..e3a5707 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -363,6 +363,7 @@ libxl_version_info = Struct("version_info", [ ("virt_start", uint64), ("pagesize", integer), ("commandline", string), + ("build_id", string), ], dir=DIR_OUT) libxl_domain_create_info = Struct("domain_create_info",[ diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index a3610fc..23da95e 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -5861,6 +5861,7 @@ static void output_xeninfo(void) printf("cc_compile_by : %s\n", info->compile_by); printf("cc_compile_domain : %s\n", info->compile_domain); printf("cc_compile_date : %s\n", info->compile_date); + printf("build_id : %s\n", info->build_id); return; }