Patchwork qga: add missing commas in json docs

login
register
mail settings
Submitter Eric Blake
Date Jan. 2, 2013, 4:15 p.m.
Message ID <1357143311-10927-1-git-send-email-eblake@redhat.com>
Download mbox | patch
Permalink /patch/209072/
State New
Headers show

Comments

Eric Blake - Jan. 2, 2013, 4:15 p.m.
* qga/qapi-schema.json: Use valid JSON.

Signed-off-by: Eric Blake <eblake@redhat.com>
---
 qga/qapi-schema.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Michael Roth - Jan. 2, 2013, 11:14 p.m.
On Wed, Jan 02, 2013 at 09:15:11AM -0700, Eric Blake wrote:
> * qga/qapi-schema.json: Use valid JSON.
> 
> Signed-off-by: Eric Blake <eblake@redhat.com>

Thanks, applied to qga branch

> ---
>  qga/qapi-schema.json | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json
> index ed0eb69..d91d903 100644
> --- a/qga/qapi-schema.json
> +++ b/qga/qapi-schema.json
> @@ -31,7 +31,7 @@
>  #
>  # Since: 1.1
>  # ##
> -{ 'command': 'guest-sync-delimited'
> +{ 'command': 'guest-sync-delimited',
>    'data':    { 'id': 'int' },
>    'returns': 'int' }
> 
> @@ -69,7 +69,7 @@
>  #
>  # Since: 0.15.0
>  ##
> -{ 'command': 'guest-sync'
> +{ 'command': 'guest-sync',
>    'data':    { 'id': 'int' },
>    'returns': 'int' }
> 
> -- 
> 1.8.0.2
>
Eric Blake - Jan. 14, 2013, 9:54 p.m.
On 01/02/2013 04:14 PM, mdroth wrote:
> On Wed, Jan 02, 2013 at 09:15:11AM -0700, Eric Blake wrote:
>> * qga/qapi-schema.json: Use valid JSON.
>>
>> Signed-off-by: Eric Blake <eblake@redhat.com>
> 
> Thanks, applied to qga branch

Ping.  I don't see this patch in today's qga pull request:
https://lists.gnu.org/archive/html/qemu-devel/2013-01/msg02272.html
Should it go in through the trivial branch instead?
Michael Roth - Jan. 14, 2013, 10:08 p.m.
On Mon, Jan 14, 2013 at 02:54:05PM -0700, Eric Blake wrote:
> On 01/02/2013 04:14 PM, mdroth wrote:
> > On Wed, Jan 02, 2013 at 09:15:11AM -0700, Eric Blake wrote:
> >> * qga/qapi-schema.json: Use valid JSON.
> >>
> >> Signed-off-by: Eric Blake <eblake@redhat.com>
> > 
> > Thanks, applied to qga branch
> 
> Ping.  I don't see this patch in today's qga pull request:
> https://lists.gnu.org/archive/html/qemu-devel/2013-01/msg02272.html
> Should it go in through the trivial branch instead?

Strange... I must've forgotten to push it after applying it locally.
I'll include it in a v2 of the current pull shortly.

> 
> -- 
> Eric Blake   eblake redhat com    +1-919-301-3266
> Libvirt virtualization library http://libvirt.org
>
Michael Roth - Jan. 14, 2013, 10:16 p.m.
On Mon, Jan 14, 2013 at 02:54:05PM -0700, Eric Blake wrote:
> On 01/02/2013 04:14 PM, mdroth wrote:
> > On Wed, Jan 02, 2013 at 09:15:11AM -0700, Eric Blake wrote:
> >> * qga/qapi-schema.json: Use valid JSON.
> >>
> >> Signed-off-by: Eric Blake <eblake@redhat.com>
> > 
> > Thanks, applied to qga branch
> 
> Ping.  I don't see this patch in today's qga pull request:
> https://lists.gnu.org/archive/html/qemu-devel/2013-01/msg02272.html
> Should it go in through the trivial branch instead?

Actually, since it applies cleanly for both I just send a separate pull

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

Patch

diff --git a/qga/qapi-schema.json b/qga/qapi-schema.json
index ed0eb69..d91d903 100644
--- a/qga/qapi-schema.json
+++ b/qga/qapi-schema.json
@@ -31,7 +31,7 @@ 
 #
 # Since: 1.1
 # ##
-{ 'command': 'guest-sync-delimited'
+{ 'command': 'guest-sync-delimited',
   'data':    { 'id': 'int' },
   'returns': 'int' }

@@ -69,7 +69,7 @@ 
 #
 # Since: 0.15.0
 ##
-{ 'command': 'guest-sync'
+{ 'command': 'guest-sync',
   'data':    { 'id': 'int' },
   'returns': 'int' }