Bug: section "Rocker switch device" starts with the rocker stuff, but
then has unrelated stuff, like ReplayMode, xen-load-devices-state, ...

Cause: rocker.json is included in the middle of section "QMP commands".

Fix: include it in a sane place, namely next to the other sub-schemas.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 qapi-schema.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/qapi-schema.json b/qapi-schema.json
index 76b5888..81cef23 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -82,6 +82,7 @@
 { 'include': 'qapi/crypto.json' }
 { 'include': 'qapi/block.json' }
 { 'include': 'qapi/event.json' }
+{ 'include': 'qapi/rocker.json' }
 { 'include': 'qapi/trace.json' }
 { 'include': 'qapi/introspect.json' }
 
@@ -6273,9 +6274,6 @@
 ##
 { 'command': 'rtc-reset-reinjection' }
 
-# Rocker ethernet network switch
-{ 'include': 'qapi/rocker.json' }
-
 ##
 # @ReplayMode:
 #
-- 
2.7.5

On Thu, Aug 24, 2017 at 2:02 PM, Markus Armbruster <armbru@redhat.com> wrote:
> Bug: section "Rocker switch device" starts with the rocker stuff, but
> then has unrelated stuff, like ReplayMode, xen-load-devices-state, ...
>
> Cause: rocker.json is included in the middle of section "QMP commands".
>
> Fix: include it in a sane place, namely next to the other sub-schemas.
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>

> ---
>  qapi-schema.json | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/qapi-schema.json b/qapi-schema.json
> index 76b5888..81cef23 100644
> --- a/qapi-schema.json
> +++ b/qapi-schema.json
> @@ -82,6 +82,7 @@
>  { 'include': 'qapi/crypto.json' }
>  { 'include': 'qapi/block.json' }
>  { 'include': 'qapi/event.json' }
> +{ 'include': 'qapi/rocker.json' }
>  { 'include': 'qapi/trace.json' }
>  { 'include': 'qapi/introspect.json' }
>
> @@ -6273,9 +6274,6 @@
>  ##
>  { 'command': 'rtc-reset-reinjection' }
>
> -# Rocker ethernet network switch
> -{ 'include': 'qapi/rocker.json' }
> -
>  ##
>  # @ReplayMode:
>  #
> --
> 2.7.5
>
>



-- 
Marc-André Lureau

On Thu, Aug 24, 2017 at 2:02 PM, Markus Armbruster <armbru@redhat.com> wrote:
> Bug: section "Rocker switch device" starts with the rocker stuff, but
> then has unrelated stuff, like ReplayMode, xen-load-devices-state, ...
>
> Cause: rocker.json is included in the middle of section "QMP commands".
>
> Fix: include it in a sane place, namely next to the other sub-schemas.
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>


Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>


> ---
>  qapi-schema.json | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/qapi-schema.json b/qapi-schema.json
> index 76b5888..81cef23 100644
> --- a/qapi-schema.json
> +++ b/qapi-schema.json
> @@ -82,6 +82,7 @@
>  { 'include': 'qapi/crypto.json' }
>  { 'include': 'qapi/block.json' }
>  { 'include': 'qapi/event.json' }
> +{ 'include': 'qapi/rocker.json' }
>  { 'include': 'qapi/trace.json' }
>  { 'include': 'qapi/introspect.json' }
>
> @@ -6273,9 +6274,6 @@
>  ##
>  { 'command': 'rtc-reset-reinjection' }
>
> -# Rocker ethernet network switch
> -{ 'include': 'qapi/rocker.json' }
> -
>  ##
>  # @ReplayMode:
>  #
> --
> 2.7.5
>
>



-- 
Marc-André Lureau