|
 |
9ae3a8 |
From 7805c18f11162994f870271080ab0848759a6d07 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
Date: Fri, 18 Oct 2013 08:14:48 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 23/81] qemu-img: fix invalid JSON
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1382084091-16636-24-git-send-email-pbonzini@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 55006
|
|
|
9ae3a8 |
O-Subject: [RHEL 7.0 qemu-kvm PATCH 23/26] qemu-img: fix invalid JSON
|
|
|
9ae3a8 |
Bugzilla: 989646
|
|
|
9ae3a8 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Single quotes for JSON are a QMP-ism, use real JSON in
|
|
|
9ae3a8 |
qemu-img output.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Reported-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit c745bfb4300206280ce6156b4bafe765f610057c)
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
qemu-img.c | 2 +-
|
|
|
9ae3a8 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
qemu-img.c | 2 +-
|
|
|
9ae3a8 |
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/qemu-img.c b/qemu-img.c
|
|
|
9ae3a8 |
index e58c052..3a59bf0 100644
|
|
|
9ae3a8 |
--- a/qemu-img.c
|
|
|
9ae3a8 |
+++ b/qemu-img.c
|
|
|
9ae3a8 |
@@ -1960,7 +1960,7 @@ static void dump_map_entry(OutputFormat output_format, MapEntry *e,
|
|
|
9ae3a8 |
(e->flags & BDRV_BLOCK_ZERO) ? "true" : "false",
|
|
|
9ae3a8 |
(e->flags & BDRV_BLOCK_DATA) ? "true" : "false");
|
|
|
9ae3a8 |
if (e->flags & BDRV_BLOCK_OFFSET_VALID) {
|
|
|
9ae3a8 |
- printf(", 'offset': %"PRId64"", e->offset);
|
|
|
9ae3a8 |
+ printf(", \"offset\": %"PRId64"", e->offset);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
putchar('}');
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|