diff mbox

qemu-img: fix invalid JSON

Message ID 1378918072-1963-1-git-send-email-pbonzini@redhat.com
State New
Headers show

Commit Message

Paolo Bonzini Sept. 11, 2013, 4:47 p.m. UTC 
Single quotes for JSON are a QMP-ism, use real JSON in
qemu-img output.

Reported-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 qemu-img.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Eric Blake Sept. 11, 2013, 4:58 p.m. UTC | #1 
On 09/11/2013 10:47 AM, Paolo Bonzini wrote:
> Single quotes for JSON are a QMP-ism, use real JSON in
> qemu-img output.
> 
> Reported-by: Kevin Wolf <kwolf@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.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 3e5e388..626365d 100644
> --- a/qemu-img.c
> +++ b/qemu-img.c
> @@ -1842,7 +1842,7 @@ static void dump_map_entry(OutputFormat output_format, MapEntry *e,
>                 (e->flags & BDRV_BLOCK_ZERO) ? "true" : "false",
>                 (e->flags & BDRV_BLOCK_DATA) ? "true" : "false");
>          if (e->flags & BDRV_BLOCK_OFFSET_VALID) {
> -            printf(", 'offset': %"PRId64"", e->offset);
> +            printf(", \"offset\": %"PRId64"", e->offset);
>          }
>          putchar('}');
>  
>
Kevin Wolf Sept. 12, 2013, 11:50 a.m. UTC | #2 
Am 11.09.2013 um 18:58 hat Eric Blake geschrieben:
> On 09/11/2013 10:47 AM, Paolo Bonzini wrote:
> > Single quotes for JSON are a QMP-ism, use real JSON in
> > qemu-img output.
> > 
> > Reported-by: Kevin Wolf <kwolf@redhat.com>
> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> > ---
> >  qemu-img.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Reviewed-by: Eric Blake <eblake@redhat.com>

Thanks, applied to the block branch.

Kevin
diff mbox

Patch

diff --git a/qemu-img.c b/qemu-img.c
index 3e5e388..626365d 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -1842,7 +1842,7 @@  static void dump_map_entry(OutputFormat output_format, MapEntry *e,
                (e->flags & BDRV_BLOCK_ZERO) ? "true" : "false",
                (e->flags & BDRV_BLOCK_DATA) ? "true" : "false");
         if (e->flags & BDRV_BLOCK_OFFSET_VALID) {
-            printf(", 'offset': %"PRId64"", e->offset);
+            printf(", \"offset\": %"PRId64"", e->offset);
         }
         putchar('}');