Merged Alexandre's qmp-schema.json related updates

diff --git a/debian/patches/add-qmp-get-link-status.patch b/debian/patches/add-qmp-get-link-status.patch
index 105d4152e50585adec754fb86e80187b888becc4..84f1a1d5e4484e265fd5cb5902eafd04d625903c 100644 (file)
--- a/debian/patches/add-qmp-get-link-status.patch
+++ b/debian/patches/add-qmp-get-link-status.patch
@@ -2,10 +2,19 @@ Index: new/qapi-schema.json
 ===================================================================
 --- new.orig/qapi-schema.json  2014-12-10 09:15:50.890262765 +0100
 +++ new/qapi-schema.json       2014-12-11 09:20:31.072561486 +0100
-@@ -1366,6 +1366,22 @@
+@@ -1366,6 +1366,31 @@
  ##
  { 'command': 'set_link', 'data': {'name': 'str', 'up': 'bool'} }
  
++##
++# @LinkStatus:
++#
++# Nic LinkStatus information.
++#
++# @status: the status of the nic
++#
++##
++{ 'struct': 'LinkStatus', 'data': {'status': 'int'} } 
 +
 +##
 +# @get_link_status
@@ -20,7 +29,7 @@ Index: new/qapi-schema.json
 +#
 +# Notes: this is an Proxmox VE extension and not offical part of Qemu.
 +##
-+{ 'command': 'get_link_status', 'data': {'name': 'str'}, 'returns': 'int'}
++{ 'command': 'get_link_status', 'data': {'name': 'str'}, 'returns': 'LinkStatus'}
 +
  ##
  # @balloon:

diff --git a/debian/patches/backup-add-pve-monitor-commands.patch b/debian/patches/backup-add-pve-monitor-commands.patch
index 450be3b404b30ba67c62e21e51c44d0269c19a6d..09aebfd4c4935289c52ad44a6c218c1526abb10d 100644 (file)
--- a/debian/patches/backup-add-pve-monitor-commands.patch
+++ b/debian/patches/backup-add-pve-monitor-commands.patch
@@ -650,7 +650,7 @@ Index: new/qapi-schema.json
 +# @uuid: #optional uuid for this backup job
 +#
 +##
-+{ 'type': 'BackupStatus',
++{ 'struct': 'BackupStatus',
 +  'data': {'*status': 'str', '*errmsg': 'str', '*total': 'int',
 +           '*transferred': 'int', '*zero-bytes': 'int',
 +           '*start-time': 'int', '*end-time': 'int',
@@ -690,7 +690,7 @@ Index: new/qapi-schema.json
 +                                    '*format': 'BackupFormat',
 +                                    '*config-file': 'str',
 +                                    '*devlist': 'str', '*speed': 'int' },
-+  'returns': 'str' }
++  'returns': 'UuidInfo' }
 +
 +##
 +# @query-backup

diff --git a/debian/patches/internal-snapshot-async.patch b/debian/patches/internal-snapshot-async.patch
index f79a3cf4000e0a463a87519dc6c6d3bae123dcea..9fdf610e102b65c46dd92aef06808acf6e289736 100644 (file)
--- a/debian/patches/internal-snapshot-async.patch
+++ b/debian/patches/internal-snapshot-async.patch
@@ -268,7 +268,7 @@ Index: new/qapi-schema.json
 +#
 +# Since: 1.3
 +##
-+{ 'type': 'SaveVMInfo',
++{ 'struct': 'SaveVMInfo',
 +  'data': {'*status': 'str', '*error': 'str',
 +           '*total-time': 'int', '*bytes': 'int'} }
 +