817b7667e8
Lots of patches touched and some slight changes to the build process since QEMU switched to meson as their build system. Functionality-wise very little rebasing required. New patches introduced: * pve/0058: to fix VMA backups and clean up some code in general with new 5.2 features now available to us (namely coroutine-enabled QMP). * extra/0002: don't build man pages for guest agent when disabled * extra/0003: fix live-migration with hugepages * 0017 and 0018 are adjusted to fix snapshot abort and improve snap performance a bit Signed-off-by: Stefan Reiter <s.reiter@proxmox.com>
70 lines
1.9 KiB
Diff
70 lines
1.9 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 | 8 ++++++++
|
|
qapi/block-core.json | 25 +++++++++++++++++++++++++
|
|
2 files changed, 33 insertions(+)
|
|
|
|
diff --git a/pve-backup.c b/pve-backup.c
|
|
index bfb648d6b5..ba9d0d8a86 100644
|
|
--- a/pve-backup.c
|
|
+++ b/pve-backup.c
|
|
@@ -1051,3 +1051,11 @@ 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;
|
|
+ return ret;
|
|
+}
|
|
diff --git a/qapi/block-core.json b/qapi/block-core.json
|
|
index 553112d998..e0a0a60354 100644
|
|
--- a/qapi/block-core.json
|
|
+++ b/qapi/block-core.json
|
|
@@ -868,6 +868,31 @@
|
|
##
|
|
{ '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-library-version: Running version of libproxmox-backup-qemu0 library.
|
|
+#
|
|
+##
|
|
+{ 'struct': 'ProxmoxSupportStatus',
|
|
+ 'data': { 'pbs-dirty-bitmap': '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:
|
|
#
|