qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: marcandre.lureau@redhat.com, eblake@redhat.com
Subject: [Qemu-devel] [PATCH v2 03/16] qapi-schema: Rocker doc section contains unrelated stuff, fix
Date: Thu, 24 Aug 2017 21:13:55 +0200	[thread overview]
Message-ID: <1503602048-12268-4-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1503602048-12268-1-git-send-email-armbru@redhat.com>

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 3db3d19..add4777 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -81,6 +81,7 @@
 { 'include': 'qapi/common.json' }
 { 'include': 'qapi/crypto.json' }
 { 'include': 'qapi/block.json' }
+{ 'include': 'qapi/rocker.json' }
 { 'include': 'qapi/event.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

  parent reply	other threads:[~2017-08-24 19:14 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-24 19:13 [Qemu-devel] [PATCH v2 00/16] qapi-schema: Reorganize along maintenance boundaries Markus Armbruster
2017-08-24 19:13 ` [Qemu-devel] [PATCH v2 01/16] qapi-schema: Document how generated documentation is ordered Markus Armbruster
2017-08-24 19:13 ` [Qemu-devel] [PATCH v2 02/16] qapi-schema: Introspection doc is in the wrong section, fix Markus Armbruster
2017-08-24 19:13 ` Markus Armbruster [this message]
2017-08-24 19:13 ` [Qemu-devel] [PATCH v2 04/16] qapi-schema: Collect sockets stuff in qapi/sockets.json Markus Armbruster
2017-08-25 11:05   ` Marc-André Lureau
2017-08-24 19:13 ` [Qemu-devel] [PATCH v2 05/16] qapi-schema: Collect run state stuff in qapi/run-state.json Markus Armbruster
2017-08-25 11:07   ` Marc-André Lureau
2017-08-24 19:13 ` [Qemu-devel] [PATCH v2 06/16] qapi-schema: Collect char device stuff in qapi/char.json Markus Armbruster
2017-08-25 11:11   ` Marc-André Lureau
2017-08-28 11:20     ` Markus Armbruster
2017-08-24 19:13 ` [Qemu-devel] [PATCH v2 07/16] qapi-schema: Collect net device stuff in qapi/net.json Markus Armbruster
2017-08-25 11:14   ` Marc-André Lureau
2017-08-24 19:14 ` [Qemu-devel] [PATCH v2 08/16] qapi-schema: Collect UI stuff in qapi/ui.json Markus Armbruster
2017-08-25 11:15   ` Marc-André Lureau
2017-08-25 11:16   ` Gerd Hoffmann
2017-08-24 19:14 ` [Qemu-devel] [PATCH v2 09/16] qapi-schema: Collect migration stuff in qapi/migration.json Markus Armbruster
2017-08-25 11:15   ` Marc-André Lureau
2017-08-25 16:08   ` Dr. David Alan Gilbert
2017-08-28 11:22     ` Markus Armbruster
2017-09-01 12:14       ` Markus Armbruster
2017-08-24 19:14 ` [Qemu-devel] [PATCH v2 10/16] qapi-schema: Collect transaction stuff in qapi/transaction.json Markus Armbruster
2017-08-25 11:16   ` Marc-André Lureau
2017-08-24 19:14 ` [Qemu-devel] [PATCH v2 11/16] qapi-schema: Collect TPM stuff in qapi/tpm.json Markus Armbruster
2017-08-25 11:20   ` Marc-André Lureau
2017-08-28 11:29     ` Markus Armbruster
2017-09-07 15:05       ` Stefan Berger
2017-09-07 15:55         ` Markus Armbruster
2017-08-24 19:14 ` [Qemu-devel] [PATCH v2 12/16] qapi-schema: Move block events from event.json to block.json Markus Armbruster
2017-08-25  9:31   ` Alberto Garcia
2017-08-25 11:20   ` Marc-André Lureau
2017-08-24 19:14 ` [Qemu-devel] [PATCH v2 13/16] qapi-schema: Fold event.json back into qapi-schema.json Markus Armbruster
2017-08-25 11:22   ` Marc-André Lureau
2017-08-24 19:14 ` [Qemu-devel] [PATCH v2 14/16] qapi-schema: Make block-core.json self-contained Markus Armbruster
2017-08-25 11:24   ` Marc-André Lureau
2017-08-24 19:14 ` [Qemu-devel] [PATCH v2 15/16] qapi-schema: Move queries from common.json to qapi-schema.json Markus Armbruster
2017-08-25 11:27   ` Marc-André Lureau
2017-08-28 11:31     ` Markus Armbruster
2017-08-24 19:14 ` [Qemu-devel] [PATCH v2 16/16] qapi-schema: Improve section headings Markus Armbruster
2017-08-25 11:28   ` Marc-André Lureau
2017-08-24 19:41 ` [Qemu-devel] [PATCH v2 00/16] qapi-schema: Reorganize along maintenance boundaries Eric Blake
2017-08-25  4:50   ` Markus Armbruster
2017-09-01 12:26 ` Markus Armbruster

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1503602048-12268-4-git-send-email-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=eblake@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).