bf251437e9
Many changes were necessary this time around:
* QAPI was changed to avoid redundant has_* variables, see commit
44ea9d9be3 ("qapi: Start to elide redundant has_FOO in generated C")
for details. This affected many QMP commands added by Proxmox too.
* Pending querying for migration got split into two functions, one to
estimate, one for exact value, see commit c8df4a7aef ("migration:
Split save_live_pending() into state_pending_*") for details. Relevant
for savevm-async and PBS dirty bitmap.
* Some block (driver) functions got converted to coroutines, so the
Proxmox block drivers needed to be adapted.
* Alloc track auto-detaching during PBS live restore got broken by
AioContext-related changes resulting in a deadlock. The current, hacky
method was replaced by a simpler one. Stefan apparently ran into a
problem with that when he wrote the driver, but there were
improvements in the stream job code since then and I didn't manage to
reproduce the issue. It's a separate patch "alloc-track: fix deadlock
during drop" for now, you can find the details there.
* Async snapshot-related changes:
- The pending querying got adapted to the above-mentioned split and
a patch is added to optimize it/make it more similar to what
upstream code does.
- Added initialization of the compression counters (for
future-proofing).
- It's necessary the hold the BQL (big QEMU lock = iothread mutex)
during the setup phase, because block layer functions are used there
and not doing so leads to racy, hard-to-debug crashes or hangs. It's
necessary to change some upstream code too for this, a version of
the patch "migration: for snapshots, hold the BQL during setup
callbacks" is intended to be upstreamed.
- Need to take the bdrv graph read lock before flushing.
* hmp_info_balloon was moved to a different file.
* Needed to include a new headers from time to time to still get the
correct functions.
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
99 lines
2.7 KiB
Diff
99 lines
2.7 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>
|
|
[FE: add get_link_status to command name exceptions]
|
|
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
|
---
|
|
net/net.c | 27 +++++++++++++++++++++++++++
|
|
qapi/net.json | 15 +++++++++++++++
|
|
qapi/pragma.json | 2 ++
|
|
3 files changed, 44 insertions(+)
|
|
|
|
diff --git a/net/net.c b/net/net.c
|
|
index 6492ad530e..33e901cba8 100644
|
|
--- a/net/net.c
|
|
+++ b/net/net.c
|
|
@@ -1397,6 +1397,33 @@ RxFilterInfoList *qmp_query_rx_filter(const char *name, Error **errp)
|
|
return filter_list;
|
|
}
|
|
|
|
+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 d6eb30008b..4fe71b149d 100644
|
|
--- a/qapi/net.json
|
|
+++ b/qapi/net.json
|
|
@@ -36,6 +36,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 7f810b0e97..29233db825 100644
|
|
--- a/qapi/pragma.json
|
|
+++ b/qapi/pragma.json
|
|
@@ -15,6 +15,7 @@
|
|
'device_add',
|
|
'device_del',
|
|
'expire_password',
|
|
+ 'get_link_status',
|
|
'migrate_cancel',
|
|
'netdev_add',
|
|
'netdev_del',
|
|
@@ -26,6 +27,7 @@
|
|
'system_wakeup' ],
|
|
# Commands allowed to return a non-dictionary
|
|
'command-returns-exceptions': [
|
|
+ 'get_link_status',
|
|
'human-monitor-command',
|
|
'qom-get',
|
|
'query-tpm-models',
|