From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57985) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X2L3u-0005ZU-EC for qemu-devel@nongnu.org; Wed, 02 Jul 2014 09:59:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X2L3p-0005eh-OY for qemu-devel@nongnu.org; Wed, 02 Jul 2014 09:59:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:28486) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X2L3p-0005ec-FD for qemu-devel@nongnu.org; Wed, 02 Jul 2014 09:58:57 -0400 Message-ID: <53B41018.6040208@redhat.com> Date: Wed, 02 Jul 2014 07:58:48 -0600 From: Eric Blake MIME-Version: 1.0 References: <1403857452-23768-1-git-send-email-cnanakos@grnet.gr> <1403857452-23768-5-git-send-email-cnanakos@grnet.gr> In-Reply-To: <1403857452-23768-5-git-send-email-cnanakos@grnet.gr> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="5qets3Upf3IN8bsGCARnB51PgXvRfiQAE" Subject: Re: [Qemu-devel] [PATCH v6 4/5] QMP: Add support for Archipelago List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Chrysostomos Nanakos , qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@redhat.com This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --5qets3Upf3IN8bsGCARnB51PgXvRfiQAE Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 06/27/2014 02:24 AM, Chrysostomos Nanakos wrote: > Introduce new enum BlockdevOptionsArchipelago. >=20 > @volume: #Name of the Archipelago volume image >=20 > @mport: #'mport' is the port number on which mapperd is > listening. This is optional and if not specified,= > QEMU will make Archipelago to use the default por= t. >=20 > @vport: #'vport' is the port number on which vlmcd is > listening. This is optional and if not specified,= > QEMU will make Archipelago to use the default por= t. >=20 > @segment: #optional The name of the shared memory segment > Archipelago stack is using. This is optional > and if not specified, QEMU will make Archipelago > use the default value, 'archipelago'. >=20 > Signed-off-by: Chrysostomos Nanakos > --- > qapi/block-core.json | 39 ++++++++++++++++++++++++++++++++++++--- > 1 file changed, 36 insertions(+), 3 deletions(-) >=20 > diff --git a/qapi/block-core.json b/qapi/block-core.json > index af6b436..55eb152 100644 > --- a/qapi/block-core.json > +++ b/qapi/block-core.json > @@ -190,8 +190,8 @@ > # @ro: true if the backing device was open read-only > # > # @drv: the name of the block format used to open the backing device. = As of > -# 0.14.0 this can be: 'blkdebug', 'bochs', 'cloop', 'cow', 'dmg'= , > -# 'file', 'file', 'ftp', 'ftps', 'host_cdrom', 'host_device', > +# 0.14.0 this can be: 'archipelago', 'blkdebug', 'bochs', 'cloop= ', 'cow', > +# 'dmg', 'file', 'file', 'ftp', 'ftps', 'host_cdrom', 'host_devi= ce', > # 'host_floppy', 'http', 'https', 'nbd', 'parallels', 'qcow', > # 'qcow2', 'raw', 'tftp', 'vdi', 'vmdk', 'vpc', 'vvfat' The comment is wrong (although not necessarily your fault). It should really look more like: As of 0.14.0, the following are supported:... =2E..probably some other releases mentioned, as I'm fairly certain not al= l of the list was in 0.14.0... As of 2.2, the following are also supported: 'archipelago' > # > +## > +# @BlockdevOptionsArchipelago > +# > +# Driver specific block device options for Archipelago. > +# > +# @volume: Name of the Archipelago volume image > +# > +# > +# @mport: #optional The port number on which mapperd is Why two blank lines? > +# listening. This is optional > +# and if not specified, QEMU will make Archipela= go > +# use the default port. and that port number is? > +# > +# @vport: #optional The port number on which vlmcd is > +# listening. This is optional > +# and if not specified, QEMU will make Archipela= go > +# use the default port. and that port number is? > +# > +# @segment: #optional The name of the shared memory segmen= t > +# Archipelago stack is using. This is optional > +# and if not specified, QEMU will make Archipela= go > +# use the default value, 'archipelago'. > +# Since: 2.1 At this point, I'm not sure if your series will make 2.1. We've already entered hard freeze, so even though your first post was before soft freeze, it's hard to justify taking a new feature this late in the game that still hasn't passed review. You will probably have to change this to 2.2 when rebasing. > +## > +{ 'type': 'BlockdevOptionsArchipelago', > + 'data': { 'volume': 'str', > + '*mport': 'int', > + '*vport': 'int', > + '*segment': 'str' } } > + Looks reasonable. > + > ## > # @BlkdebugEvent > # > @@ -1347,6 +1379,7 @@ > 'base': 'BlockdevOptionsBase', > 'discriminator': 'driver', > 'data': { > + 'archipelago':'BlockdevOptionsArchipelago', Again, not necessarily your fault, but we ought to do a better job of documenting when new union branches are added in later releases. > 'file': 'BlockdevOptionsFile', > 'host_device':'BlockdevOptionsFile', > 'host_cdrom': 'BlockdevOptionsFile', >=20 --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --5qets3Upf3IN8bsGCARnB51PgXvRfiQAE Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJTtBAYAAoJEKeha0olJ0NqqUQH/iQvTV8hl2sAHDI3IUtVLurk 7uJQp2K96HaWStH6L6PHcsg8OMxD4vsVNU50Z+xYFLe5JH1QFND95K12qgf1VPou sQGerwra5dgjuo8PnvT5EZCHKZ0sGTyN7QyihxlLTWQSCZdehynv/xFX4RvyIdxU RalXIw0+2hEmQ40uZfPP1uOOvRCCNA0sXc5c/X7DSLIrZzasPcCgVm4pnquvcK+h ZHMuwYiVwohplDhKuVmk0KPc+MF8c8fD+nwU2VjFHArPstzBkXVhfH5S9dxqVG9P lp6KW5KJpsnzLVE8nziYf3/+Uc4/4SUue3EDzKBI/AeBaiii/5um/NmMxlGzkYs= =E0FH -----END PGP SIGNATURE----- --5qets3Upf3IN8bsGCARnB51PgXvRfiQAE--