[Qemu-devel] [PATCH v2 0/1] qemu-img: Add QEMU_PKGVERSION to QEMU_IMG_VERSION (was qemu-img: Add --pkgversion common option)

[Qemu-devel] [PATCH v2 0/1] qemu-img: Add QEMU_PKGVERSION to QEMU_IMG_VERSION (was qemu-img: Add --pkgversion common option)

[Don Slutz]

Changes v1 to v2:

Added a cover letter because subject changed.

Peter Maydell & Eric Blake
  Switch to be consistent with both linux-user and the softmmu
  emulators

---------------

Just a little backgound.  --version was added to qemu-img:

5f6979cb (Jeff Cody           2014-04-28 14:37:18 -0400

I did this cahnge a long time before and just now getting
around to posting it:

85f9f5b2 (Don Slutz           2012-12-20 15:47:37 -0500


Don Slutz (1):
  qemu-img: Add QEMU_PKGVERSION to QEMU_IMG_VERSION

 qemu-img.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
1.8.4

[Qemu-devel] [PATCH v2 1/1] qemu-img: Add QEMU_PKGVERSION to QEMU_IMG_VERSION

[Don Slutz]

This is the same way vl.c handles this.

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

diff --git a/qemu-img.c b/qemu-img.c
index 7876258..b6e9220 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -35,7 +35,7 @@
 #include "block/qapi.h"
 #include <getopt.h>
 
-#define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION \
+#define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION QEMU_PKGVERSION \
                           ", Copyright (c) 2004-2008 Fabrice Bellard\n"
 
 typedef struct img_cmd_t {
-- 
1.8.4

Re: [Qemu-devel] [PATCH v2 1/1] qemu-img: Add QEMU_PKGVERSION to QEMU_IMG_VERSION

[Eric Blake]

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

On 01/09/2015 08:17 AM, Don Slutz wrote:
> This is the same way vl.c handles this.
> 
> Signed-off-by: Don Slutz <dslutz@verizon.com>
> ---
>  qemu-img.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Reviewed-by: Eric Blake <eblake@redhat.com>

> 
> diff --git a/qemu-img.c b/qemu-img.c
> index 7876258..b6e9220 100644
> --- a/qemu-img.c
> +++ b/qemu-img.c
> @@ -35,7 +35,7 @@
>  #include "block/qapi.h"
>  #include <getopt.h>
>  
> -#define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION \
> +#define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION QEMU_PKGVERSION \
>                            ", Copyright (c) 2004-2008 Fabrice Bellard\n"
>  
>  typedef struct img_cmd_t {
> 

-- 
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 v2 1/1] qemu-img: Add QEMU_PKGVERSION to QEMU_IMG_VERSION

[Don Slutz]

Ping.

On 01/09/15 11:21, Eric Blake wrote:
> On 01/09/2015 08:17 AM, Don Slutz wrote:
>> This is the same way vl.c handles this.
>>
>> Signed-off-by: Don Slutz <dslutz@verizon.com>
>> ---
>>  qemu-img.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Reviewed-by: Eric Blake <eblake@redhat.com>
> 
>>
>> diff --git a/qemu-img.c b/qemu-img.c
>> index 7876258..b6e9220 100644
>> --- a/qemu-img.c
>> +++ b/qemu-img.c
>> @@ -35,7 +35,7 @@
>>  #include "block/qapi.h"
>>  #include <getopt.h>
>>  
>> -#define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION \
>> +#define QEMU_IMG_VERSION "qemu-img version " QEMU_VERSION QEMU_PKGVERSION \
>>                            ", Copyright (c) 2004-2008 Fabrice Bellard\n"
>>  
>>  typedef struct img_cmd_t {
>>
> 

Re: [Qemu-devel] [PATCH v2 1/1] qemu-img: Add QEMU_PKGVERSION to QEMU_IMG_VERSION

[Kevin Wolf]

Am 09.01.2015 um 16:17 hat Don Slutz geschrieben:
> This is the same way vl.c handles this.
> 
> Signed-off-by: Don Slutz <dslutz@verizon.com>

Thanks, applied to the block branch.

Kevin