bump version to 2.11.1-1

[pve-qemu.git] / debian / patches / pve / 0012-qmp-add-get_link_status.patch

diff --git a/debian/patches/pve/0012-qmp-add-get_link_status.patch b/debian/patches/pve/0012-qmp-add-get_link_status.patch
index bba5a9363f6d605194110092d7b4c1a3a9599e5e..28d3edbc733ff94f703e5a44eecc2d4b886f70d6 100644 (file)
--- a/debian/patches/pve/0012-qmp-add-get_link_status.patch
+++ b/debian/patches/pve/0012-qmp-add-get_link_status.patch
@@ -1,18 +1,18 @@
-From 6c70ffe629c678a110d311fab784d65836a7917e Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
 Date: Wed, 9 Dec 2015 16:34:41 +0100
-Subject: [PATCH 12/28] qmp: add get_link_status
+Subject: [PATCH] qmp: add get_link_status
 
 ---
- net/net.c        | 27 +++++++++++++++++++++++++++
- qapi-schema.json | 16 ++++++++++++++++
- 2 files changed, 43 insertions(+)
+ net/net.c     | 27 +++++++++++++++++++++++++++
+ qapi/net.json | 15 +++++++++++++++
+ 2 files changed, 42 insertions(+)
 
 diff --git a/net/net.c b/net/net.c
-index 0ac3b9e80c..7410c1e5f3 100644
+index 39ef546708..3681aa2173 100644
 --- a/net/net.c
 +++ b/net/net.c
-@@ -1373,6 +1373,33 @@ void hmp_info_network(Monitor *mon, const QDict *qdict)
+@@ -1399,6 +1399,33 @@ void hmp_info_network(Monitor *mon, const QDict *qdict)
      }
  }
  
@@ -46,19 +46,11 @@ index 0ac3b9e80c..7410c1e5f3 100644
  void qmp_set_link(const char *name, bool up, Error **errp)
  {
      NetClientState *ncs[MAX_QUEUE_NUM];
-diff --git a/qapi-schema.json b/qapi-schema.json
-index 361700d37c..5e82933ca1 100644
---- a/qapi-schema.json
-+++ b/qapi-schema.json
-@@ -56,6 +56,7 @@
- { 'pragma': {
-     # Commands allowed to return a non-dictionary:
-     'returns-whitelist': [
-+        'get_link_status',
-         'human-monitor-command',
-         'qom-get',
-         'query-migrate-cache-size',
-@@ -2537,6 +2538,21 @@
+diff --git a/qapi/net.json b/qapi/net.json
+index 4beff5d582..73334c8f3c 100644
+--- a/qapi/net.json
++++ b/qapi/net.json
+@@ -35,6 +35,21 @@
  { 'command': 'set_link', 'data': {'name': 'str', 'up': 'bool'} }
  
  ##
@@ -77,9 +69,9 @@ index 361700d37c..5e82933ca1 100644
 +{ 'command': 'get_link_status', 'data': {'name': 'str'}, 'returns': 'int'}
 +
 +##
- # @balloon:
+ # @netdev_add:
  #
- # Request the balloon driver to change its balloon size.
+ # Add a network backend.
 -- 
 2.11.0