| Message ID | 1452219920-14043-4-git-send-email-konrad.wilk@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Jan 07, 2016 at 09:25:20PM -0500, Konrad Rzeszutek Wilk wrote: > If the hypervisor is built with we will display it. > > Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> > --- > v2: Include HAVE_*, use libxl_zalloc, s/rc/ret/ > --- > tools/libxl/libxl.c | 24 ++++++++++++++++++++++++ > tools/libxl/libxl.h | 5 +++++ > tools/libxl/libxl_types.idl | 1 + > tools/libxl/xl_cmdimpl.c | 1 + > 4 files changed, 31 insertions(+) > > diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c > index 9207621..b894c1f 100644 > --- a/tools/libxl/libxl.c > +++ b/tools/libxl/libxl.c > @@ -5263,6 +5263,7 @@ libxl_numainfo *libxl_get_numainfo(libxl_ctx *ctx, int *nr) > > const libxl_version_info* libxl_get_version_info(libxl_ctx *ctx) > { > + GC_INIT(ctx); > union { > xen_extraversion_t xen_extra; > xen_compile_info_t xen_cc; > @@ -5270,8 +5271,10 @@ const libxl_version_info* libxl_get_version_info(libxl_ctx *ctx) > xen_capabilities_info_t xen_caps; > xen_platform_parameters_t p_parms; > xen_commandline_t xen_commandline; > + xen_build_id_t build_id; > } u; > long xen_version; > + int ret; > libxl_version_info *info = &ctx->version_info; > > if (info->xen_version_extra != NULL) > @@ -5304,6 +5307,27 @@ const libxl_version_info* libxl_get_version_info(libxl_ctx *ctx) > xc_version(ctx->xch, XENVER_commandline, &u.xen_commandline); > info->commandline = strdup(u.xen_commandline); > > + u.build_id.len = sizeof(u) - sizeof(u.build_id); > + ret = xc_version(ctx->xch, XENVER_build_id, &u.build_id); > + switch ( ret ) { > + case -EPERM: > + case -ENODATA: > + case 0: > + info->build_id = strdup(""); I guess you're following existing strdup examples in this function. Since now there is a GC in scope, you can use libxl__strdup. Presumably you can also change other instances to use libxl__strdup. Wei.
> > + info->build_id = strdup(""); > > I guess you're following existing strdup examples in this function. /me nods. > > Since now there is a GC in scope, you can use libxl__strdup. Presumably > you can also change other instances to use libxl__strdup. Would you be OK if I did it in another patch? I can make it part of the series if you would like. > > Wei. > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel
diff --git a/tools/libxl/libxl.c b/tools/libxl/libxl.c index 9207621..b894c1f 100644 --- a/tools/libxl/libxl.c +++ b/tools/libxl/libxl.c @@ -5263,6 +5263,7 @@ libxl_numainfo *libxl_get_numainfo(libxl_ctx *ctx, int *nr) const libxl_version_info* libxl_get_version_info(libxl_ctx *ctx) { + GC_INIT(ctx); union { xen_extraversion_t xen_extra; xen_compile_info_t xen_cc; @@ -5270,8 +5271,10 @@ const libxl_version_info* libxl_get_version_info(libxl_ctx *ctx) xen_capabilities_info_t xen_caps; xen_platform_parameters_t p_parms; xen_commandline_t xen_commandline; + xen_build_id_t build_id; } u; long xen_version; + int ret; libxl_version_info *info = &ctx->version_info; if (info->xen_version_extra != NULL) @@ -5304,6 +5307,27 @@ const libxl_version_info* libxl_get_version_info(libxl_ctx *ctx) xc_version(ctx->xch, XENVER_commandline, &u.xen_commandline); info->commandline = strdup(u.xen_commandline); + u.build_id.len = sizeof(u) - sizeof(u.build_id); + ret = xc_version(ctx->xch, XENVER_build_id, &u.build_id); + switch ( ret ) { + case -EPERM: + case -ENODATA: + case 0: + info->build_id = strdup(""); + break; + default: + if (ret > 0) { + unsigned int i; + + info->build_id = libxl__zalloc(NOGC, (ret * 2) + 1); + + for (i = 0; i < ret ; i++) + snprintf(&info->build_id[i * 2], 3, "%02hhx", u.build_id.buf[i]); + } else + LOGEV(ERROR, ret, "getting build_id"); + break; + } + GC_FREE; return info; } diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 05606a7..b91d906 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -218,6 +218,11 @@ #define LIBXL_HAVE_SOFT_RESET 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 9658356..6c29885 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -355,6 +355,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 f9933cb..1fbe7f3 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -5549,6 +5549,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; }
If the hypervisor is built with we will display it. Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> --- v2: Include HAVE_*, use libxl_zalloc, s/rc/ret/ --- tools/libxl/libxl.c | 24 ++++++++++++++++++++++++ tools/libxl/libxl.h | 5 +++++ tools/libxl/libxl_types.idl | 1 + tools/libxl/xl_cmdimpl.c | 1 + 4 files changed, 31 insertions(+)