* [Qemu-devel] [PATCH] qga: add missing commas in json docs
@ 2013-01-02 16:15 Eric Blake
2013-01-02 23:14 ` mdroth
0 siblings, 1 reply; 6+ messages in thread
From: Eric Blake @ 2013-01-02 16:15 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, mdroth, lcapitulino
* 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(-)
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [Qemu-devel] [PATCH] qga: add missing commas in json docs
2013-01-02 16:15 [Qemu-devel] [PATCH] qga: add missing commas in json docs Eric Blake
@ 2013-01-02 23:14 ` mdroth
2013-01-14 21:54 ` Eric Blake
0 siblings, 1 reply; 6+ messages in thread
From: mdroth @ 2013-01-02 23:14 UTC (permalink / raw)
To: Eric Blake; +Cc: qemu-trivial, qemu-devel, lcapitulino
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
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [Qemu-devel] [PATCH] qga: add missing commas in json docs
2013-01-02 23:14 ` mdroth
@ 2013-01-14 21:54 ` Eric Blake
2013-01-14 22:08 ` mdroth
2013-01-14 22:16 ` mdroth
0 siblings, 2 replies; 6+ messages in thread
From: Eric Blake @ 2013-01-14 21:54 UTC (permalink / raw)
To: mdroth; +Cc: qemu-trivial, qemu-devel, lcapitulino
[-- Attachment #1: Type: text/plain, Size: 532 bytes --]
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?
--
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: 621 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] qga: add missing commas in json docs
2013-01-14 21:54 ` Eric Blake
@ 2013-01-14 22:08 ` mdroth
2013-01-14 22:16 ` mdroth
1 sibling, 0 replies; 6+ messages in thread
From: mdroth @ 2013-01-14 22:08 UTC (permalink / raw)
To: Eric Blake; +Cc: qemu-trivial, qemu-devel, lcapitulino
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
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] qga: add missing commas in json docs
2013-01-14 21:54 ` Eric Blake
2013-01-14 22:08 ` mdroth
@ 2013-01-14 22:16 ` mdroth
1 sibling, 0 replies; 6+ messages in thread
From: mdroth @ 2013-01-14 22:16 UTC (permalink / raw)
To: Eric Blake; +Cc: qemu-trivial, qemu-devel, lcapitulino
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
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Qemu-devel] [PULL 0/1] qemu-ga: documentation/schema fix
@ 2013-01-14 22:25 Michael Roth
2013-01-14 22:25 ` [Qemu-devel] [PATCH] qga: add missing commas in json docs Michael Roth
0 siblings, 1 reply; 6+ messages in thread
From: Michael Roth @ 2013-01-14 22:25 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori
Small patch that was missing from previous qga-pull-1-14-2013 pull.
I've confirmed that this won't conflict with outstanding, so please
pull both.
The following changes since commit b8bec49cccbf8e34558371df60e7e64419c4fde9:
dataplane: fix build breakage on set_guest_notifiers() (2013-01-14 13:36:12 -0600)
are available in the git repository at:
git://github.com/mdroth/qemu.git qga-pull-1-14-2013-2
for you to fetch changes up to 01b87f6d217ed05d5948562f74f5cf7b511a9c6c:
qga: add missing commas in json docs (2013-01-14 16:15:26 -0600)
----------------------------------------------------------------
Eric Blake (1):
qga: add missing commas in json docs
qga/qapi-schema.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread* [Qemu-devel] [PATCH] qga: add missing commas in json docs
2013-01-14 22:25 [Qemu-devel] [PULL 0/1] qemu-ga: documentation/schema fix Michael Roth
@ 2013-01-14 22:25 ` Michael Roth
0 siblings, 0 replies; 6+ messages in thread
From: Michael Roth @ 2013-01-14 22:25 UTC (permalink / raw)
To: qemu-devel; +Cc: aliguori
From: Eric Blake <eblake@redhat.com>
* qga/qapi-schema.json: Use valid JSON.
Signed-off-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
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.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-01-14 22:30 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-02 16:15 [Qemu-devel] [PATCH] qga: add missing commas in json docs Eric Blake
2013-01-02 23:14 ` mdroth
2013-01-14 21:54 ` Eric Blake
2013-01-14 22:08 ` mdroth
2013-01-14 22:16 ` mdroth
-- strict thread matches above, loose matches on Subject: below --
2013-01-14 22:25 [Qemu-devel] [PULL 0/1] qemu-ga: documentation/schema fix Michael Roth
2013-01-14 22:25 ` [Qemu-devel] [PATCH] qga: add missing commas in json docs Michael Roth
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).