[PATCH] tools/xl: Add 'xen_version' to `xl info`

[PATCH] tools/xl: Add 'xen_version' to `xl info`

[Andrew Cooper]

Getting the full Xen version in an easily scriptable way is awkward,
especially if trying to piece together from xen_{major,minor,extra}.

This reflects $(XEN_FULLVERSION) in the build system (but under a more
sensible name, as $(XEN_VERSION) is just the major number).

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
 tools/libxl/xl_cmdimpl.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
index 8a478ba..d365f90 100644
--- a/tools/libxl/xl_cmdimpl.c
+++ b/tools/libxl/xl_cmdimpl.c
@@ -4582,6 +4582,8 @@ static void output_xeninfo(void)
     printf("xen_major              : %d\n", info->xen_version_major);
     printf("xen_minor              : %d\n", info->xen_version_minor);
     printf("xen_extra              : %s\n", info->xen_version_extra);
+    printf("xen_version            : %d.%d%s\n", info->xen_version_major,
+           info->xen_version_minor, info->xen_version_extra);
     printf("xen_caps               : %s\n", info->capabilities);
     printf("xen_scheduler          : %s\n", libxl_scheduler_to_string(sched));
     printf("xen_pagesize           : %u\n", info->pagesize);
-- 
1.7.10.4

Re: [PATCH] tools/xl: Add 'xen_version' to `xl info`

[Matt Wilson]

On Wed, Jul 10, 2013 at 05:46:30PM +0100, Andrew Cooper wrote:
> Getting the full Xen version in an easily scriptable way is awkward,
> especially if trying to piece together from xen_{major,minor,extra}.
> 
> This reflects $(XEN_FULLVERSION) in the build system (but under a more
> sensible name, as $(XEN_VERSION) is just the major number).
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

Acked-by: Matt Wilson <msw@amazon.com>

> ---
>  tools/libxl/xl_cmdimpl.c |    2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c
> index 8a478ba..d365f90 100644
> --- a/tools/libxl/xl_cmdimpl.c
> +++ b/tools/libxl/xl_cmdimpl.c
> @@ -4582,6 +4582,8 @@ static void output_xeninfo(void)
>      printf("xen_major              : %d\n", info->xen_version_major);
>      printf("xen_minor              : %d\n", info->xen_version_minor);
>      printf("xen_extra              : %s\n", info->xen_version_extra);
> +    printf("xen_version            : %d.%d%s\n", info->xen_version_major,
> +           info->xen_version_minor, info->xen_version_extra);
>      printf("xen_caps               : %s\n", info->capabilities);
>      printf("xen_scheduler          : %s\n", libxl_scheduler_to_string(sched));
>      printf("xen_pagesize           : %u\n", info->pagesize);

Re: [PATCH] tools/xl: Add 'xen_version' to `xl info` [and 3 more messages]

[Ian Jackson]

Andrew Cooper writes ("[PATCH] tools/xl: Add 'xen_version' to `xl info`"):
> Getting the full Xen version in an easily scriptable way is awkward,
> especially if trying to piece together from xen_{major,minor,extra}.
> 
> This reflects $(XEN_FULLVERSION) in the build system (but under a more
> sensible name, as $(XEN_VERSION) is just the major number).

Applied, thanks.

Matt Wilson writes ("Re: [Xen-devel] [PATCH] tools/xl: Add 'xen_version' to `xl info`"):
> On Thu, Jul 11, 2013 at 10:21:24AM +0100, George Dunlap wrote:
> > Is there actually a reason to print it separately at all?  Why not
> > replace the individual lines with the unified line?
> 
> Please don't do that. I'm sure that there are scripts out there that
> stitch together the parts into a version string. They'll break if we
> remove the parts.

Quite.

Thanks,
Ian.

Re: [PATCH] tools/xl: Add 'xen_version' to `xl info`

[George Dunlap]

On Wed, Jul 10, 2013 at 5:46 PM, Andrew Cooper
<andrew.cooper3@citrix.com> wrote:
> Getting the full Xen version in an easily scriptable way is awkward,
> especially if trying to piece together from xen_{major,minor,extra}.
>
> This reflects $(XEN_FULLVERSION) in the build system (but under a more
> sensible name, as $(XEN_VERSION) is just the major number).
>
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>

I can see the point, but it seems a bit redundant to have the version
info printed twice.

This makes me wonder if it might make sense to have options to print
just individual items; e.g.:

xl info --xen_version

or perhaps

xi info --format="%{xen_version}"

or something.

-George

Re: [PATCH] tools/xl: Add 'xen_version' to `xl info`

[Andrew Cooper]

On 11/07/13 10:02, George Dunlap wrote:
> On Wed, Jul 10, 2013 at 5:46 PM, Andrew Cooper
> <andrew.cooper3@citrix.com> wrote:
>> Getting the full Xen version in an easily scriptable way is awkward,
>> especially if trying to piece together from xen_{major,minor,extra}.
>>
>> This reflects $(XEN_FULLVERSION) in the build system (but under a more
>> sensible name, as $(XEN_VERSION) is just the major number).
>>
>> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> I can see the point, but it seems a bit redundant to have the version
> info printed twice.
>
> This makes me wonder if it might make sense to have options to print
> just individual items; e.g.:
>
> xl info --xen_version
>
> or perhaps
>
> xi info --format="%{xen_version}"
>
> or something.
>
> -George

Ah - that was part 2 which I am working on in my copious free time.

At the moment, xl info takes no parameters, or an -h or -n.

I was thinking it could be modifed to optionally take a positional
paramater, such as

xl info xen_version

Even with this however, my original point still stands.  Getting the
version number is awkward.

~Andrew

Re: [PATCH] tools/xl: Add 'xen_version' to `xl info`

[George Dunlap]

On 11/07/13 10:10, Andrew Cooper wrote:
> On 11/07/13 10:02, George Dunlap wrote:
>> On Wed, Jul 10, 2013 at 5:46 PM, Andrew Cooper
>> <andrew.cooper3@citrix.com> wrote:
>>> Getting the full Xen version in an easily scriptable way is awkward,
>>> especially if trying to piece together from xen_{major,minor,extra}.
>>>
>>> This reflects $(XEN_FULLVERSION) in the build system (but under a more
>>> sensible name, as $(XEN_VERSION) is just the major number).
>>>
>>> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
>> I can see the point, but it seems a bit redundant to have the version
>> info printed twice.
>>
>> This makes me wonder if it might make sense to have options to print
>> just individual items; e.g.:
>>
>> xl info --xen_version
>>
>> or perhaps
>>
>> xi info --format="%{xen_version}"
>>
>> or something.
>>
>> -George
> Ah - that was part 2 which I am working on in my copious free time.
>
> At the moment, xl info takes no parameters, or an -h or -n.
>
> I was thinking it could be modifed to optionally take a positional
> paramater, such as
>
> xl info xen_version
>
> Even with this however, my original point still stands.  Getting the
> version number is awkward.

Is there actually a reason to print it separately at all?  Why not 
replace the individual lines with the unified line?

  -George

Re: [PATCH] tools/xl: Add 'xen_version' to `xl info`

[Andrew Cooper]

On 11/07/13 10:21, George Dunlap wrote:
> On 11/07/13 10:10, Andrew Cooper wrote:
>> On 11/07/13 10:02, George Dunlap wrote:
>>> On Wed, Jul 10, 2013 at 5:46 PM, Andrew Cooper
>>> <andrew.cooper3@citrix.com> wrote:
>>>> Getting the full Xen version in an easily scriptable way is awkward,
>>>> especially if trying to piece together from xen_{major,minor,extra}.
>>>>
>>>> This reflects $(XEN_FULLVERSION) in the build system (but under a more
>>>> sensible name, as $(XEN_VERSION) is just the major number).
>>>>
>>>> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
>>> I can see the point, but it seems a bit redundant to have the version
>>> info printed twice.
>>>
>>> This makes me wonder if it might make sense to have options to print
>>> just individual items; e.g.:
>>>
>>> xl info --xen_version
>>>
>>> or perhaps
>>>
>>> xi info --format="%{xen_version}"
>>>
>>> or something.
>>>
>>> -George
>> Ah - that was part 2 which I am working on in my copious free time.
>>
>> At the moment, xl info takes no parameters, or an -h or -n.
>>
>> I was thinking it could be modifed to optionally take a positional
>> paramater, such as
>>
>> xl info xen_version
>>
>> Even with this however, my original point still stands.  Getting the
>> version number is awkward.
>
> Is there actually a reason to print it separately at all?  Why not
> replace the individual lines with the unified line?
>
>  -George
>

So as not to break anyone currently relying on `xl info | grep
^xen_major | cut -d ':' -f 2` and friend

~Andrew

Re: [PATCH] tools/xl: Add 'xen_version' to `xl info`

[Matt Wilson]

On Thu, Jul 11, 2013 at 10:21:24AM +0100, George Dunlap wrote:
> On 11/07/13 10:10, Andrew Cooper wrote:

[...]

> >
> >Even with this however, my original point still stands.  Getting the
> >version number is awkward.
> 
> Is there actually a reason to print it separately at all?  Why not
> replace the individual lines with the unified line?

Please don't do that. I'm sure that there are scripts out there that
stitch together the parts into a version string. They'll break if we
remove the parts.

--msw