Re: [Qemu-devel] [PATCH v8 4/5] QMP: Add support for Archipelago

2014-07-31 Thread Stefan Hajnoczi
On Wed, Jul 30, 2014 at 08:59:09PM +0300, Chrysostomos Nanakos wrote:
 Introduce new enum BlockdevOptionsArchipelago.
 
 @volume:  #Name of the Archipelago volume image
 
 @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 port.
 
 @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 port.
 
 @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'.
 
 Signed-off-by: Chrysostomos Nanakos cnana...@grnet.gr
 ---
  qapi/block-core.json |   35 ++-
  1 file changed, 34 insertions(+), 1 deletion(-)

Thanks, applied to my block-next tree and replaced v7 patch:
https://github.com/stefanha/qemu/commits/block-next

Stefan


pgpajz68n068R.pgp
Description: PGP signature


[Qemu-devel] [PATCH v8 4/5] QMP: Add support for Archipelago

2014-07-30 Thread Chrysostomos Nanakos
Introduce new enum BlockdevOptionsArchipelago.

@volume:  #Name of the Archipelago volume image

@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 port.

@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 port.

@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'.

Signed-off-by: Chrysostomos Nanakos cnana...@grnet.gr
---
 qapi/block-core.json |   35 ++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/qapi/block-core.json b/qapi/block-core.json
index e378653..d1c4fc2 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -194,6 +194,7 @@
 #   'file', 'file', 'ftp', 'ftps', 'host_cdrom', 'host_device',
 #   'host_floppy', 'http', 'https', 'nbd', 'parallels', 'qcow',
 #   'qcow2', 'raw', 'tftp', 'vdi', 'vmdk', 'vpc', 'vvfat'
+#   2.2: 'archipelago'
 #
 # @backing_file: #optional the name of the backing file (for copy-on-write)
 #
@@ -1143,7 +1144,7 @@
 # Since: 2.0
 ##
 { 'enum': 'BlockdevDriver',
-  'data': [ 'file', 'host_device', 'host_cdrom', 'host_floppy',
+  'data': [ 'archipelago', 'file', 'host_device', 'host_cdrom', 'host_floppy',
 'http', 'https', 'ftp', 'ftps', 'tftp', 'vvfat', 'blkdebug',
 'blkverify', 'bochs', 'cloop', 'cow', 'dmg', 'parallels', 'qcow',
 'qcow2', 'qed', 'raw', 'vdi', 'vhdx', 'vmdk', 'vpc', 'quorum' ] }
@@ -1273,6 +1274,37 @@
 '*pass-discard-snapshot': 'bool',
 '*pass-discard-other': 'bool' } }
 
+
+##
+# @BlockdevOptionsArchipelago
+#
+# Driver specific block device options for Archipelago.
+#
+# @volume:  Name of the Archipelago volume image
+#
+# @mport:   #optional The port number on which mapperd is
+#   listening. This is optional
+#   and if not specified, QEMU will make Archipelago
+#   use the default port (1001).
+#
+# @vport:   #optional The port number on which vlmcd is
+#   listening. This is optional
+#   and if not specified, QEMU will make Archipelago
+#   use the default port (501).
+#
+# @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'.
+# Since: 2.2
+##
+{ 'type': 'BlockdevOptionsArchipelago',
+  'data': { 'volume': 'str',
+'*mport': 'int',
+'*vport': 'int',
+'*segment': 'str' } }
+
+
 ##
 # @BlkdebugEvent
 #
@@ -1416,6 +1448,7 @@
   'base': 'BlockdevOptionsBase',
   'discriminator': 'driver',
   'data': {
+  'archipelago':'BlockdevOptionsArchipelago',
   'file':   'BlockdevOptionsFile',
   'host_device':'BlockdevOptionsFile',
   'host_cdrom': 'BlockdevOptionsFile',
-- 
1.7.10.4