Received: from eggs.gnu.org ([2001:4830:134:3::10]:35715) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dzj0z-00079H-GX for qemu-devel@nongnu.org; Wed, 04 Oct 2017 08:43:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dzj0v-0005sf-Jo for qemu-devel@nongnu.org; Wed, 04 Oct 2017 08:43:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40834) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dzj0v-0005rf-AL for qemu-devel@nongnu.org; Wed, 04 Oct 2017 08:43:01 -0400 From: Markus Armbruster References: <20170913132417.24384-1-david@redhat.com> <20170913132417.24384-19-david@redhat.com> <87k20eq9em.fsf@dusky.pond.sub.org> <20171004100415.0f0ded10.cohuck@redhat.com> Date: Wed, 04 Oct 2017 14:42:55 +0200 In-Reply-To: <20171004100415.0f0ded10.cohuck@redhat.com> (Cornelia Huck's message of "Wed, 4 Oct 2017 10:04:15 +0200") Message-ID: <87k20bm6cw.fsf@dusky.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH v5 18/22] s390x: implement query-hotpluggable-cpus List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cornelia Huck Cc: Matthew Rosato , thuth@redhat.com, Eduardo Habkost , David Hildenbrand , Richard Henderson , qemu-devel@nongnu.org, Alexander Graf , borntraeger@de.ibm.com, Paolo Bonzini , Igor Mammedov Cornelia Huck writes: > On Mon, 02 Oct 2017 09:46:41 +0200 > Markus Armbruster wrote: > >> David Hildenbrand writes: >> >> > CPU hotplug is only possible on a per core basis on s390x. So let's >> > add possible_cpus and properly wire everything up. >> > >> > Signed-off-by: David Hildenbrand >> [...] >> > diff --git a/qapi-schema.json b/qapi-schema.json >> > index f3af2cb851..79e9f85404 100644 >> > --- a/qapi-schema.json >> > +++ b/qapi-schema.json >> > @@ -3121,6 +3121,22 @@ >> > # } >> > # ]} >> > # >> > +# For s390x-virtio-ccw machine type started with -smp 1,maxcpus=2 -cpu qemu >> > +# (Since: 2.11): >> > +# >> > +# -> { "execute": "query-hotpluggable-cpus" } >> > +# <- {"return": [ >> > +# { >> > +# "type": "qemu-s390-cpu", "vcpus-count": 1, >> > +# "props": { "core-id": 1 } >> > +# }, >> > +# { >> > +# "qom-path": "/machine/unattached/device[0]", >> > +# "type": "qemu-s390-cpu", "vcpus-count": 1, >> > +# "props": { "core-id": 0 } >> > +# } >> > +# ]} >> > +# >> > ## >> > { 'command': 'query-hotpluggable-cpus', 'returns': ['HotpluggableCPU'] } >> >> Please stick in '# Example:' like we do in query-hotpluggable-cpus's doc >> comment. I expect the generated documentation to be illegible[*] >> without it. > > Should '# Example:' go before each of the examples (instead of the > beginning of the example block), then? Whatever makes the generated documentation look better. >> [*] If you want to perform a quick eye-over, try running "make >> tests/qapi-schema/doc-good.test.txt" and examine the result. > > Hmm... I might be missing something in my setup: > > [cohuck@gondolin build]$ make tests/qapi-schema/doc-good.test.txt > GEN tests/qapi-schema/doc-good.test.txt > tests/qapi-schema/doc-good.test.texi:79: @subsection seen before @end deftp > tests/qapi-schema/doc-good.test.texi:90: unmatched `@end deftp' > make: *** [Makefile:695: tests/qapi-schema/doc-good.test.txt] Error 1 Pasto, sorry! Try "make docs/interop/qemu-qmp-ref.txt". .pdf and .html also work.