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>
44 lines
1.5 KiB
Diff
44 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
|
Date: Fri, 10 Jul 2020 13:22:35 +0200
|
|
Subject: [PATCH] pbs: fix missing crypt and compress parameters
|
|
|
|
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
|
|
---
|
|
pve-backup.c | 8 ++++++--
|
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/pve-backup.c b/pve-backup.c
|
|
index ba9d0d8a86..e1dcf10a45 100644
|
|
--- a/pve-backup.c
|
|
+++ b/pve-backup.c
|
|
@@ -958,6 +958,8 @@ UuidInfo *qmp_backup(
|
|
.backup_file = backup_file,
|
|
.has_password = has_password,
|
|
.password = password,
|
|
+ .has_keyfile = has_keyfile,
|
|
+ .keyfile = keyfile,
|
|
.has_key_password = has_key_password,
|
|
.key_password = key_password,
|
|
.has_fingerprint = has_fingerprint,
|
|
@@ -968,6 +970,10 @@ UuidInfo *qmp_backup(
|
|
.backup_time = backup_time,
|
|
.has_use_dirty_bitmap = has_use_dirty_bitmap,
|
|
.use_dirty_bitmap = use_dirty_bitmap,
|
|
+ .has_compress = has_compress,
|
|
+ .compress = compress,
|
|
+ .has_encrypt = has_encrypt,
|
|
+ .encrypt = encrypt,
|
|
.has_format = has_format,
|
|
.format = format,
|
|
.has_config_file = has_config_file,
|
|
@@ -976,8 +982,6 @@ UuidInfo *qmp_backup(
|
|
.firewall_file = firewall_file,
|
|
.has_devlist = has_devlist,
|
|
.devlist = devlist,
|
|
- .has_compress = has_compress,
|
|
- .has_encrypt = has_encrypt,
|
|
.has_speed = has_speed,
|
|
.speed = speed,
|
|
.errp = errp,
|