f376b2b9e2
Very clean rebase, only the +pve version handling needed manual fixing. Drops two applied patches from extra/ and adds one new from upstream (extra/0001*, fixes VNC over unix sockets) as well as 3 of my own for allowing password changes on custom VNC displays again (as seen and reviewed upstream, but not yet applied). Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
89 lines
2.3 KiB
Diff
89 lines
2.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
|
Date: Mon, 6 Apr 2020 12:16:37 +0200
|
|
Subject: [PATCH] PVE: [Up] qmp: add get_link_status
|
|
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
---
|
|
net/net.c | 27 +++++++++++++++++++++++++++
|
|
qapi/net.json | 15 +++++++++++++++
|
|
qapi/pragma.json | 1 +
|
|
3 files changed, 43 insertions(+)
|
|
|
|
diff --git a/net/net.c b/net/net.c
|
|
index 76bbb7c31b..82e0a768b4 100644
|
|
--- a/net/net.c
|
|
+++ b/net/net.c
|
|
@@ -1314,6 +1314,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_DRIVER__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_DRIVER_NIC) {
|
|
+ ret = ncs[0]->peer->link_down;
|
|
+ }
|
|
+
|
|
+ return (int64_t) ret ? 0 : 1;
|
|
+}
|
|
+
|
|
void colo_notify_filters_event(int event, Error **errp)
|
|
{
|
|
NetClientState *nc;
|
|
diff --git a/qapi/net.json b/qapi/net.json
|
|
index 7fab2e7cd8..74c9a6109e 100644
|
|
--- a/qapi/net.json
|
|
+++ b/qapi/net.json
|
|
@@ -35,6 +35,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' }
|
|
+
|
|
##
|
|
# @netdev_add:
|
|
#
|
|
diff --git a/qapi/pragma.json b/qapi/pragma.json
|
|
index 3bc0335d1f..7c91ea3685 100644
|
|
--- a/qapi/pragma.json
|
|
+++ b/qapi/pragma.json
|
|
@@ -22,6 +22,7 @@
|
|
'system_reset',
|
|
'system_wakeup' ],
|
|
'command-returns-exceptions': [
|
|
+ 'get_link_status',
|
|
'human-monitor-command',
|
|
'qom-get',
|
|
'query-tpm-models',
|