[Qemu-devel] [PATCH 1/1] qemu-img: Add --pkgversion common option

[Qemu-devel] [PATCH 1/1] qemu-img: Add --pkgversion common option

[Don Slutz]

This will output the QEMU_PKGVERSION which is set by configure's
--with-pkgversion=

Signed-off-by: Don Slutz <dslutz@verizon.com>
---
 qemu-img.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/qemu-img.c b/qemu-img.c
index 7876258..f73bea6 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -3064,6 +3064,17 @@ int main(int argc, char **argv)
     }
     cmdname = argv[1];
 
+    /* Report pkgversion */
+    if (!strcmp(cmdname, "--pkgversion")) {
+        argc--; argv++; /* Drop special arg. */
+        printf("qemu-img version " QEMU_VERSION
+               " pkgversion " QEMU_PKGVERSION "\n");
+        if (argc < 2) {
+            return 0;
+        }
+        cmdname = argv[1]; /* Update */
+    }
+
     /* find the command */
     for (cmd = img_cmds; cmd->name != NULL; cmd++) {
         if (!strcmp(cmdname, cmd->name)) {
-- 
1.8.4

Re: [Qemu-devel] [PATCH 1/1] qemu-img: Add --pkgversion common option

[Peter Maydell]

On 8 January 2015 at 14:30, Don Slutz <dslutz@verizon.com> wrote:
> This will output the QEMU_PKGVERSION which is set by configure's
> --with-pkgversion=

> +    /* Report pkgversion */
> +    if (!strcmp(cmdname, "--pkgversion")) {
> +        argc--; argv++; /* Drop special arg. */
> +        printf("qemu-img version " QEMU_VERSION
> +               " pkgversion " QEMU_PKGVERSION "\n");
> +        if (argc < 2) {
> +            return 0;
> +        }
> +        cmdname = argv[1]; /* Update */
> +    }

Wouldn't it be better to just report the QEMU_PKGVERSION
as part of the version info we already report in --version?
This would be consistent with both linux-user and the softmmu
emulators, which do:

 printf("QEMU emulator version " QEMU_VERSION QEMU_PKGVERSION ",
Copyright (c) 2003-2008 Fabrice Bellard\n");

-- PMM

Re: [Qemu-devel] [PATCH 1/1] qemu-img: Add --pkgversion common option

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 1134 bytes --]

On 01/08/2015 07:40 AM, Peter Maydell wrote:
> On 8 January 2015 at 14:30, Don Slutz <dslutz@verizon.com> wrote:
>> This will output the QEMU_PKGVERSION which is set by configure's
>> --with-pkgversion=
> 
>> +    /* Report pkgversion */
>> +    if (!strcmp(cmdname, "--pkgversion")) {
>> +        argc--; argv++; /* Drop special arg. */
>> +        printf("qemu-img version " QEMU_VERSION
>> +               " pkgversion " QEMU_PKGVERSION "\n");
>> +        if (argc < 2) {
>> +            return 0;
>> +        }
>> +        cmdname = argv[1]; /* Update */
>> +    }
> 
> Wouldn't it be better to just report the QEMU_PKGVERSION
> as part of the version info we already report in --version?
> This would be consistent with both linux-user and the softmmu
> emulators, which do:
> 
>  printf("QEMU emulator version " QEMU_VERSION QEMU_PKGVERSION ",
> Copyright (c) 2003-2008 Fabrice Bellard\n");

I agree - output the information unconditionally on --version, rather
than inventing a new option.

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]

Re: [Qemu-devel] [PATCH 1/1] qemu-img: Add --pkgversion common option

[Don Slutz]

[-- Attachment #1: PGP/MIME version identification --]
[-- Type: application/pgp-encrypted, Size: 11 bytes --]

[-- Attachment #2: OpenPGP encrypted message --]
[-- Type: application/octet-stream, Size: 2501 bytes --]

-----BEGIN PGP MESSAGE-----
Version: GnuPG v2.0.14 (GNU/Linux)

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
=ZOx4
-----END PGP MESSAGE-----

Re: [Qemu-devel] [PATCH 1/1] qemu-img: Add --pkgversion common option

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 298 bytes --]

On 01/09/2015 08:28 AM, Don Slutz wrote:

[an encrypted message]

Oops, you probably want to fix your Thunderbird/Enigmail settings to
sign but not encrypt when a list is involved.

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]

Re: [Qemu-devel] [PATCH 1/1] qemu-img: Add --pkgversion common option

[Don Slutz]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Sigh.  Will look into this.
   -Don Slutz

On 01/09/15 11:13, Eric Blake wrote:
> On 01/09/2015 08:28 AM, Don Slutz wrote:
> 
> [an encrypted message]
> 
> Oops, you probably want to fix your Thunderbird/Enigmail settings
> to sign but not encrypt when a list is involved.
> 
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)

iQIcBAEBAgAGBQJUsBfAAAoJEHkofi8zcwBkiEwQAJRHWVs/355i9x5S8/zb6S1c
G2WEkcXPgy6/hidX2rtAB37fCT7+DkYtQq94pOXfhkIVlXhuTk5VX4tBfSKiZFPz
LtLoKXxfWMG/pcU3xQKrpW32ZIwafYfbYhSs/0LIIy4kyiEHJZ4AQ8GztRin/MRu
H8EF9QZOxR8W3934lHiU5J+qlp5ShIH2/1AUwXmr+P9tFjyldcJlo+Zv2PXdv2Zg
St7Z2WB0BlacA8i0rSo9I9lYDaVWPzxBqkRJMyCz8lqUC5KTMk+qend9H9VVsdkW
gpSYvyrf73rUMqauY6boJZjJxl5SiVktaTmxDkkOqQHH3wynryogEt85lywpNB2C
0v+isTvSou5qThVgMbPF6LOg5KzHoHYO5BPVjq9VIRVGsr2fHNkSLIHQ8YKKLnJO
vZGZSftozrcD+A4C2rWmYlKr/rTFaEYKLjd7K2U+oak2xWrFX2h/cd0lyY7syF29
i54Bcku91wFigymgJJ6BuSkIlsM+rPSuOF3UTPqLqIfKx/EjeanBtGlzR/vIGzvU
7wvOQPs0RtULmms6vPDpw8ZmQb+T2PVvFf4jmpknuRt/Wokxoyl+sNL5msmcgTzb
x0k+0TPhIvsvUo3HYoorGoaRZyZYgk6podL11uMCFr7Iq/Y+kqo2hUnG610bH5c5
s7w+oERv382PKof37RM6
=KSVr
-----END PGP SIGNATURE-----

Re: [Qemu-devel] [PATCH 1/1] qemu-img: Add --pkgversion common option

[Don Slutz]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 01/09/15 13:02, Don Slutz wrote:
> Sigh.  Will look into this. -Don Slutz
> 

Here is what I said (un-encrypeted):

On 01/08/15 11:41, Eric Blake wrote:
> On 01/08/2015 07:40 AM, Peter Maydell wrote:
>> On 8 January 2015 at 14:30, Don Slutz <dslutz@verizon.com> 
>> wrote:

>> 
>> Wouldn't it be better to just report the QEMU_PKGVERSION as part 
>> of the version info we already report in --version? This would
>> be consistent with both linux-user and the softmmu emulators,
>> which do:

> 
> I agree - output the information unconditionally on --version, 
> rather than inventing a new option.
> 

Will do.  Have send out a v2.

   -Don Slutz
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)

iQIcBAEBAgAGBQJUsChGAAoJEHkofi8zcwBkpJ4P/ipotMH4W4z3zZOaNKkPwwjp
NQzGmxNet4KqRZ32u1GKmSOhitGEpc/2nc0+e/vSPUnY24Tf9pA0vClTl9dJSjJw
DYLSyUl0yBIYvjsrt8ozkoD0IrTeDGC20a2/iHeg0935Ep/CcFOYPoCV/MIYbQX9
LwEEIBYa3mHq3scslBMsW/Do4brUjSv1KM9vWhGthoSiGeeXpG0wnjT9X2Y9QLY+
PuuMESYuYsoWtgeD4J2g9QgZ8N5MwtDw5maud4kdgDpD4yG+hQ/b7FGmptGQczxz
WSiwIIVhPXJkg121GNDXcUAqAEn3V2qBgYSK/A/oflCTBjw55kalzVI5vDcW14KO
VMTebc8wI+g9p3aBweCluezenYPdRgpLU9++14/YyfY5+Z5+hOKs7xOgujto9qWI
/jq8AO0Qgpas6tY40lcN7O09Oli0rIXQXOI1feFcxclY5wkydWBBTcZlx8vhaMxi
oP0ZT9z8Sp8BorHYpqYaPkQP3AQKCyUX5uI3A9omnNNT6TfcE5+OYPBvEewDvBAz
IwwIQ+zWWrYH0SHQOguKg488I/rJSm9jQ8eA/lmBDE+nKiH/nI8zGrxIlAQm8xQh
PEQUZj9uJEpEA8RFreSNxtxubCm9Ug83fedcXyg/Pdp3C9i2pkmObVTtlKsJnwEB
5w2hCXXcdNMGGuMRAes/
=1G1f
-----END PGP SIGNATURE-----