mirror of
https://git.proxmox.com/git/pve-qemu
synced 2025-08-24 12:35:20 +00:00
a573598321
Many stable fixes came in since the last bump, a few of which were actually already present. Notable ones not yet present include a few guest-triggerable assert fixes, some AHCI/IDE fixes (including the fix for bug #2784), TGC fixes for i386 and ARM, VirtIO fixes, fix to avoid VNC clipboard denial-of-service. The reentrancy patches that landed upstream/stable were a newer version than the ones backported initially here, so it was necessary to explicitly drop them before rebase (which then picked up the upstream version). There were no other conflicts. Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
75 lines
2.2 KiB
Diff
75 lines
2.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Stefan Reiter <s.reiter@proxmox.com>
|
|
Date: Wed, 8 Jul 2020 11:57:53 +0200
|
|
Subject: [PATCH] PVE: add query_proxmox_support QMP command
|
|
|
|
Generic interface for future use, currently used for PBS dirty-bitmap
|
|
backup support.
|
|
|
|
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
|
|
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
|
|
[PVE: query-proxmox-support: include library version]
|
|
Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
|
|
---
|
|
pve-backup.c | 9 +++++++++
|
|
qapi/block-core.json | 29 +++++++++++++++++++++++++++++
|
|
2 files changed, 38 insertions(+)
|
|
|
|
diff --git a/pve-backup.c b/pve-backup.c
|
|
index a275a1d4e1..b10373cd8a 100644
|
|
--- a/pve-backup.c
|
|
+++ b/pve-backup.c
|
|
@@ -1072,3 +1072,12 @@ BackupStatus *qmp_query_backup(Error **errp)
|
|
|
|
return info;
|
|
}
|
|
+
|
|
+ProxmoxSupportStatus *qmp_query_proxmox_support(Error **errp)
|
|
+{
|
|
+ ProxmoxSupportStatus *ret = g_malloc0(sizeof(*ret));
|
|
+ ret->pbs_library_version = g_strdup(proxmox_backup_qemu_version());
|
|
+ ret->pbs_dirty_bitmap = true;
|
|
+ ret->pbs_dirty_bitmap_savevm = true;
|
|
+ return ret;
|
|
+}
|
|
diff --git a/qapi/block-core.json b/qapi/block-core.json
|
|
index 45b63dfe26..8b0e0d92de 100644
|
|
--- a/qapi/block-core.json
|
|
+++ b/qapi/block-core.json
|
|
@@ -863,6 +863,35 @@
|
|
##
|
|
{ 'command': 'backup-cancel' }
|
|
|
|
+##
|
|
+# @ProxmoxSupportStatus:
|
|
+#
|
|
+# Contains info about supported features added by Proxmox.
|
|
+#
|
|
+# @pbs-dirty-bitmap: True if dirty-bitmap-incremental backups to PBS are
|
|
+# supported.
|
|
+#
|
|
+# @pbs-dirty-bitmap-savevm: True if 'dirty-bitmaps' migration capability can
|
|
+# safely be set for savevm-async.
|
|
+#
|
|
+# @pbs-library-version: Running version of libproxmox-backup-qemu0 library.
|
|
+#
|
|
+##
|
|
+{ 'struct': 'ProxmoxSupportStatus',
|
|
+ 'data': { 'pbs-dirty-bitmap': 'bool',
|
|
+ 'pbs-dirty-bitmap-savevm': 'bool',
|
|
+ 'pbs-library-version': 'str' } }
|
|
+
|
|
+##
|
|
+# @query-proxmox-support:
|
|
+#
|
|
+# Returns information about supported features added by Proxmox.
|
|
+#
|
|
+# Returns: @ProxmoxSupportStatus
|
|
+#
|
|
+##
|
|
+{ 'command': 'query-proxmox-support', 'returns': 'ProxmoxSupportStatus' }
|
|
+
|
|
##
|
|
# @BlockDeviceTimedStats:
|
|
#
|