|
 |
0a122b |
From a68d863151dead2ce6d54a8838607a771f78c4b0 Mon Sep 17 00:00:00 2001
|
|
|
0a122b |
Message-Id: <a68d863151dead2ce6d54a8838607a771f78c4b0.1387369730.git.minovotn@redhat.com>
|
|
|
0a122b |
In-Reply-To: <091eecc4fa42754760dfff393dabcc2b444e9693.1387369730.git.minovotn@redhat.com>
|
|
|
0a122b |
References: <091eecc4fa42754760dfff393dabcc2b444e9693.1387369730.git.minovotn@redhat.com>
|
|
|
0a122b |
From: Markus Armbruster <armbru@redhat.com>
|
|
|
0a122b |
Date: Tue, 10 Dec 2013 15:29:10 +0100
|
|
|
0a122b |
Subject: [PATCH 10/21] qapi: lack of two commas in dict
|
|
|
0a122b |
|
|
|
0a122b |
RH-Author: Markus Armbruster <armbru@redhat.com>
|
|
|
0a122b |
Message-id: <1386689361-30281-8-git-send-email-armbru@redhat.com>
|
|
|
0a122b |
Patchwork-id: 56136
|
|
|
0a122b |
O-Subject: [PATCH 7.0 qemu-kvm 07/18] qapi: lack of two commas in dict
|
|
|
0a122b |
Bugzilla: 997915
|
|
|
0a122b |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Luiz Capitulino <lcapitulino@redhat.com>
|
|
|
0a122b |
|
|
|
0a122b |
From: Amos Kong <akong@redhat.com>
|
|
|
0a122b |
|
|
|
0a122b |
Signed-off-by: Amos Kong <akong@redhat.com>
|
|
|
0a122b |
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
|
|
|
0a122b |
(cherry picked from commit ad0f171e25fb60b385dc7d07632916d3b1043d81)
|
|
|
0a122b |
Signed-off-by: Markus Armbruster <armbru@redhat.com>
|
|
|
0a122b |
---
|
|
|
0a122b |
qapi-schema.json | 4 ++--
|
|
|
0a122b |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
0a122b |
|
|
|
0a122b |
Signed-off-by: Michal Novotny <minovotn@redhat.com>
|
|
|
0a122b |
---
|
|
|
0a122b |
qapi-schema.json | 4 ++--
|
|
|
0a122b |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
0a122b |
|
|
|
0a122b |
diff --git a/qapi-schema.json b/qapi-schema.json
|
|
|
0a122b |
index 92fcd54..b27108f 100644
|
|
|
0a122b |
--- a/qapi-schema.json
|
|
|
0a122b |
+++ b/qapi-schema.json
|
|
|
0a122b |
@@ -447,7 +447,7 @@
|
|
|
0a122b |
#
|
|
|
0a122b |
# Since: 1.4
|
|
|
0a122b |
##
|
|
|
0a122b |
-{ 'enum': 'DataFormat'
|
|
|
0a122b |
+{ 'enum': 'DataFormat',
|
|
|
0a122b |
'data': [ 'utf8', 'base64' ] }
|
|
|
0a122b |
|
|
|
0a122b |
##
|
|
|
0a122b |
@@ -1693,7 +1693,7 @@
|
|
|
0a122b |
#
|
|
|
0a122b |
# Since: 1.1
|
|
|
0a122b |
##
|
|
|
0a122b |
-{ 'enum': 'NewImageMode'
|
|
|
0a122b |
+{ 'enum': 'NewImageMode',
|
|
|
0a122b |
'data': [ 'existing', 'absolute-paths' ] }
|
|
|
0a122b |
|
|
|
0a122b |
##
|
|
|
0a122b |
--
|
|
|
0a122b |
1.7.11.7
|
|
|
0a122b |
|