]> git.proxmox.com Git - pve-qemu-kvm.git/blob - debian/patches/pve/0028-qmp-add-get_link_status.patch
adding 2.5 pve patches and left-over extra fixes
[pve-qemu-kvm.git] / debian / patches / pve / 0028-qmp-add-get_link_status.patch
1 From 1f5975e6b428b0f62fd538b36880a23ec25da9f5 Mon Sep 17 00:00:00 2001
2 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
3 Date: Wed, 9 Dec 2015 16:34:41 +0100
4 Subject: [PATCH 28/41] qmp: add get_link_status
5
6 ---
7 net/net.c | 27 +++++++++++++++++++++++++++
8 qapi-schema.json | 15 +++++++++++++++
9 qmp-commands.hx | 23 +++++++++++++++++++++++
10 scripts/qapi.py | 2 ++
11 4 files changed, 67 insertions(+)
12
13 diff --git a/net/net.c b/net/net.c
14 index ade6051..afd6ea6 100644
15 --- a/net/net.c
16 +++ b/net/net.c
17 @@ -1289,6 +1289,33 @@ void hmp_info_network(Monitor *mon, const QDict *qdict)
18 }
19 }
20
21 +int64_t qmp_get_link_status(const char *name, Error **errp)
22 +{
23 + NetClientState *ncs[MAX_QUEUE_NUM];
24 + NetClientState *nc;
25 + int queues;
26 + bool ret;
27 +
28 + queues = qemu_find_net_clients_except(name, ncs,
29 + NET_CLIENT_OPTIONS_KIND_MAX,
30 + MAX_QUEUE_NUM);
31 +
32 + if (queues == 0) {
33 + error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
34 + "Device '%s' not found", name);
35 + return (int64_t) -1;
36 + }
37 +
38 + nc = ncs[0];
39 + ret = ncs[0]->link_down;
40 +
41 + if (nc->peer->info->type == NET_CLIENT_OPTIONS_KIND_NIC) {
42 + ret = ncs[0]->peer->link_down;
43 + }
44 +
45 + return (int64_t) ret ? 0 : 1;
46 +}
47 +
48 void qmp_set_link(const char *name, bool up, Error **errp)
49 {
50 NetClientState *ncs[MAX_QUEUE_NUM];
51 diff --git a/qapi-schema.json b/qapi-schema.json
52 index be51fa2..172e200 100644
53 --- a/qapi-schema.json
54 +++ b/qapi-schema.json
55 @@ -1653,6 +1653,21 @@
56 { 'command': 'set_link', 'data': {'name': 'str', 'up': 'bool'} }
57
58 ##
59 +# @get_link_status
60 +#
61 +# Get the current link state of the nics or nic.
62 +#
63 +# @name: name of the nic you get the state of
64 +#
65 +# Return: If link is up 1
66 +# If link is down 0
67 +# If an error occure an empty string.
68 +#
69 +# Notes: this is an Proxmox VE extension and not offical part of Qemu.
70 +##
71 +{ 'command': 'get_link_status', 'data': {'name': 'str'}, 'returns': 'int'}
72 +
73 +##
74 # @balloon:
75 #
76 # Request the balloon driver to change its balloon size.
77 diff --git a/qmp-commands.hx b/qmp-commands.hx
78 index 5ef8540..0ce913a 100644
79 --- a/qmp-commands.hx
80 +++ b/qmp-commands.hx
81 @@ -1771,6 +1771,29 @@ Example:
82 EQMP
83
84 {
85 + .name = "get_link_status",
86 + .args_type = "name:s",
87 + .mhandler.cmd_new = qmp_marshal_input_get_link_status,
88 + },
89 +
90 +SQMP
91 +get_link_status
92 +--------
93 +
94 +Get the link status of a network adapter.
95 +
96 +Arguments:
97 +
98 +- "name": network device name (json-string)
99 +
100 +Example:
101 +
102 +-> { "execute": "get_link_status", "arguments": { "name": "e1000.0" } }
103 +<- { "return": {1} }
104 +
105 +EQMP
106 +
107 + {
108 .name = "getfd",
109 .args_type = "fdname:s",
110 .params = "getfd name",
111 diff --git a/scripts/qapi.py b/scripts/qapi.py
112 index 7c50cc4..8cb0f78 100644
113 --- a/scripts/qapi.py
114 +++ b/scripts/qapi.py
115 @@ -38,6 +38,8 @@ builtin_types = {
116
117 # Whitelist of commands allowed to return a non-dictionary
118 returns_whitelist = [
119 + 'get_link_status',
120 +
121 # From QMP:
122 'human-monitor-command',
123 'qom-get',
124 --
125 2.1.4
126