4567474e95
Notable changes:
* bdrv_co_p{discard,readv,writev,write_zeroes} function signatures
changed, to using int64_t for offsets/bytes and some still had int
rather than BrdvRequestFlags for the flags.
* job_cancel_sync now has a force parameter. Commit messages in
73895f3838cd7fdaf185cf1dbc47be58844a966f
4cfb3f05627ad82af473e7f7ae113c3884cd04e3
sound like using force=true makes more sense.
* Added 3 patches coming in via qemu-stable tag, most important one is
to work around a librbd issue.
* Added another 3 patches from qemu-devel to fix issue leading to
crash when live migrating with iothread.
* cluster_size calculation helper changed (see patch pve/0026).
* QAPI's if conditionals now use 'CONFIG_FOO' rather than
'defined(CONFIG_FOO)'
Signed-off-by: Fabian 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 c15abefdda..4684789813 100644
|
|
--- a/pve-backup.c
|
|
+++ b/pve-backup.c
|
|
@@ -1075,3 +1075,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 fd1ba7ccac..fc498b779d 100644
|
|
--- a/qapi/block-core.json
|
|
+++ b/qapi/block-core.json
|
|
@@ -867,6 +867,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:
|
|
#
|