From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54011) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dnlUn-0000Jb-Ip for qemu-devel@nongnu.org; Fri, 01 Sep 2017 08:56:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dnlUh-0007KN-Sw for qemu-devel@nongnu.org; Fri, 01 Sep 2017 08:56:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60964) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dnlUh-0007Jk-NH for qemu-devel@nongnu.org; Fri, 01 Sep 2017 08:56:19 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BFA2B285A8 for ; Fri, 1 Sep 2017 12:56:18 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-75.ams2.redhat.com [10.36.116.75]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8F1CA93433 for ; Fri, 1 Sep 2017 12:56:18 +0000 (UTC) From: Markus Armbruster Date: Fri, 1 Sep 2017 14:55:42 +0200 Message-Id: <20170901125611.29295-19-armbru@redhat.com> In-Reply-To: <20170901125611.29295-1-armbru@redhat.com> References: <20170901125611.29295-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 18/47] qapi-schema: Rocker doc section contains unrelated stuff, fix List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org 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 Reviewed-by: Marc-Andr=C3=A9 Lureau Message-Id: <1503602048-12268-4-git-send-email-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 3db3d1972f..add4777e9a 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' } =20 -# Rocker ethernet network switch -{ 'include': 'qapi/rocker.json' } - ## # @ReplayMode: # --=20 2.13.5