bump version to 2.6.2-2

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

From 9170833ae6e593326b1a37892282d4177ab7414e 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 28/55] qmp: add get_link_status

---
 net/net.c        | 27 +++++++++++++++++++++++++++
 qapi-schema.json | 15 +++++++++++++++
 qmp-commands.hx  | 23 +++++++++++++++++++++++
 scripts/qapi.py  |  2 ++
 4 files changed, 67 insertions(+)

diff --git a/net/net.c b/net/net.c
index 6b0b375..0e3f231 100644
--- a/net/net.c
+++ b/net/net.c
@@ -1325,6 +1325,33 @@ void hmp_info_network(Monitor *mon, const QDict *qdict)
     }
 }
 
+int64_t qmp_get_link_status(const char *name, Error **errp)
+{
+    NetClientState *ncs[MAX_QUEUE_NUM];
+    NetClientState *nc;
+    int queues;
+    bool ret;
+
+    queues = qemu_find_net_clients_except(name, ncs,
+                                          NET_CLIENT_OPTIONS_KIND_MAX,
+                                          MAX_QUEUE_NUM);
+
+    if (queues == 0) {
+        error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
+                  "Device '%s' not found", name);
+        return (int64_t) -1;
+    }
+
+    nc = ncs[0];
+    ret = ncs[0]->link_down;
+
+    if (nc->peer->info->type == NET_CLIENT_OPTIONS_KIND_NIC) {
+      ret = ncs[0]->peer->link_down;
+    }
+
+    return (int64_t) ret ? 0 : 1;
+}
+
 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 2392139..d1985d2 100644
--- a/qapi-schema.json
+++ b/qapi-schema.json
@@ -1725,6 +1725,21 @@
 { 'command': 'set_link', 'data': {'name': 'str', 'up': 'bool'} }
 
 ##
+# @get_link_status
+#
+# Get the current link state of the nics or nic.
+#
+# @name: name of the nic you get the state of
+#
+# Return: If link is up 1
+#         If link is down 0
+#         If an error occure an empty string.
+#
+# Notes: this is an Proxmox VE extension and not offical part of Qemu.
+##
+{ 'command': 'get_link_status', 'data': {'name': 'str'}, 'returns': 'int'}
+
+##
 # @balloon:
 #
 # Request the balloon driver to change its balloon size.
diff --git a/qmp-commands.hx b/qmp-commands.hx
index 437ddd6..71c5d53 100644
--- a/qmp-commands.hx
+++ b/qmp-commands.hx
@@ -1844,6 +1844,29 @@ Example:
 EQMP
 
     {
+        .name       = "get_link_status",
+        .args_type  = "name:s",
+        .mhandler.cmd_new = qmp_marshal_input_get_link_status,
+    },
+
+SQMP
+get_link_status
+--------
+
+Get the link status of a network adapter.
+
+Arguments:
+
+- "name": network device name (json-string)
+
+Example:
+
+-> { "execute": "get_link_status", "arguments": { "name": "e1000.0" } }
+<- { "return": {1} }
+
+EQMP
+
+    {
         .name       = "getfd",
         .args_type  = "fdname:s",
         .params     = "getfd name",
diff --git a/scripts/qapi.py b/scripts/qapi.py
index b13ae47..088478a 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -39,6 +39,8 @@ builtin_types = {
 
 # Whitelist of commands allowed to return a non-dictionary
 returns_whitelist = [
+    'get_link_status',
+
     # From QMP:
     'human-monitor-command',
     'qom-get',
-- 
2.1.4