From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 624F769438 for ; Mon, 18 Jan 2021 11:27:33 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 56B4411454 for ; Mon, 18 Jan 2021 11:27:33 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 3BB371144B for ; Mon, 18 Jan 2021 11:27:32 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 0920F457CA for ; Mon, 18 Jan 2021 11:27:32 +0100 (CET) From: Stefan Reiter To: pve-devel@lists.proxmox.com, t.lamprecht@proxmox.com Date: Mon, 18 Jan 2021 11:27:21 +0100 Message-Id: <20210118102721.29842-1-s.reiter@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <7acd100a-3c69-fd79-94bc-e5c6cefc61a6@proxmox.com> References: <7acd100a-3c69-fd79-94bc-e5c6cefc61a6@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.039 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH pve-qemu] explicitly specify libuuid as linking dependency X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Jan 2021 10:27:33 -0000 This previously only worked since linking against glusterfs pulls in libuuid as well. Make it more explicit and allow debug builds without glusterfs. Signed-off-by: Stefan Reiter --- patches in patches in patches in ...026-PVE-Backup-add-vma-backup-format-code.patch | 14 +++++++++++--- ...VE-Backup-proxmox-backup-patches-for-qemu.patch | 14 +++++++++++--- ...PVE-add-query_proxmox_support-QMP-command.patch | 2 +- ...fix-missing-crypt-and-compress-parameters.patch | 2 +- ...PBS-write-callback-with-big-blocks-correc.patch | 2 +- ...-zero-block-handling-to-PBS-dump-callback.patch | 2 +- ...48-PVE-add-query-pbs-bitmap-info-QMP-call.patch | 2 +- ...edirect-stderr-to-journal-when-daemonized.patch | 10 +++++----- ...Use-a-transaction-to-synchronize-job-stat.patch | 2 +- ...Use-more-coroutines-and-don-t-block-on-fi.patch | 2 +- ...-clean-up-error-handling-for-create_backu.patch | 2 +- ...PVE-Migrate-dirty-bitmap-state-via-savevm.patch | 2 +- 12 files changed, 36 insertions(+), 20 deletions(-) diff --git a/debian/patches/pve/0026-PVE-Backup-add-vma-backup-format-code.patch b/debian/patches/pve/0026-PVE-Backup-add-vma-backup-format-code.patch index bbc4562..94e27f8 100644 --- a/debian/patches/pve/0026-PVE-Backup-add-vma-backup-format-code.patch +++ b/debian/patches/pve/0026-PVE-Backup-add-vma-backup-format-code.patch @@ -5,12 +5,12 @@ Subject: [PATCH] PVE-Backup: add vma backup format code --- Makefile | 3 +- - Makefile.objs | 1 + + Makefile.objs | 2 + vma-reader.c | 857 ++++++++++++++++++++++++++++++++++++++++++++++++++ vma-writer.c | 790 ++++++++++++++++++++++++++++++++++++++++++++++ vma.c | 839 ++++++++++++++++++++++++++++++++++++++++++++++++ vma.h | 150 +++++++++ - 6 files changed, 2639 insertions(+), 1 deletion(-) + 6 files changed, 2640 insertions(+), 1 deletion(-) create mode 100644 vma-reader.c create mode 100644 vma-writer.c create mode 100644 vma.c @@ -38,7 +38,7 @@ index 13dd708c4a..7b8c17ce2d 100644 qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o $(COMMON_LDADDS) diff --git a/Makefile.objs b/Makefile.objs -index a1307c12a8..ade7b17a69 100644 +index a1307c12a8..674b7ccf3e 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -17,6 +17,7 @@ block-obj-y = block/ nbd/ scsi/ @@ -49,6 +49,14 @@ index a1307c12a8..ade7b17a69 100644 block-obj-m = block/ +@@ -51,6 +52,7 @@ common-obj-y += net/ + common-obj-y += qdev-monitor.o + common-obj-$(CONFIG_WIN32) += os-win32.o + common-obj-$(CONFIG_POSIX) += os-posix.o ++vma-writer.o-libs := -luuid + + common-obj-$(CONFIG_LINUX) += fsdev/ + diff --git a/vma-reader.c b/vma-reader.c new file mode 100644 index 0000000000..2b1d1cdab3 diff --git a/debian/patches/pve/0028-PVE-Backup-proxmox-backup-patches-for-qemu.patch b/debian/patches/pve/0028-PVE-Backup-proxmox-backup-patches-for-qemu.patch index 7896692..c669717 100644 --- a/debian/patches/pve/0028-PVE-Backup-proxmox-backup-patches-for-qemu.patch +++ b/debian/patches/pve/0028-PVE-Backup-proxmox-backup-patches-for-qemu.patch @@ -5,7 +5,7 @@ Subject: [PATCH] PVE-Backup: proxmox backup patches for qemu --- Makefile | 1 + - Makefile.objs | 2 + + Makefile.objs | 3 + Makefile.target | 2 +- block/monitor/block-hmp-cmds.c | 33 ++ blockdev.c | 1 + @@ -20,7 +20,7 @@ Subject: [PATCH] PVE-Backup: proxmox backup patches for qemu qapi/block-core.json | 109 ++++ qapi/common.json | 13 + qapi/misc.json | 13 - - 16 files changed, 1440 insertions(+), 15 deletions(-) + 16 files changed, 1441 insertions(+), 15 deletions(-) create mode 100644 proxmox-backup-client.c create mode 100644 proxmox-backup-client.h create mode 100644 pve-backup.c @@ -38,7 +38,7 @@ index 7b8c17ce2d..aec216968d 100644 qemu-bridge-helper$(EXESUF): qemu-bridge-helper.o $(COMMON_LDADDS) diff --git a/Makefile.objs b/Makefile.objs -index ade7b17a69..240eb503f2 100644 +index 674b7ccf3e..3c22019042 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -33,6 +33,7 @@ endif # CONFIG_SOFTMMU or CONFIG_TOOLS @@ -57,6 +57,14 @@ index ade7b17a69..240eb503f2 100644 common-obj-y += dump/ common-obj-y += job-qmp.o common-obj-y += monitor/ +@@ -53,6 +55,7 @@ common-obj-y += qdev-monitor.o + common-obj-$(CONFIG_WIN32) += os-win32.o + common-obj-$(CONFIG_POSIX) += os-posix.o + vma-writer.o-libs := -luuid ++pve-backup.o-libs := -luuid + + common-obj-$(CONFIG_LINUX) += fsdev/ + diff --git a/Makefile.target b/Makefile.target index ffa2657269..fd3fd6d2a7 100644 --- a/Makefile.target diff --git a/debian/patches/pve/0044-PVE-add-query_proxmox_support-QMP-command.patch b/debian/patches/pve/0044-PVE-add-query_proxmox_support-QMP-command.patch index e2dc20f..5d14f08 100644 --- a/debian/patches/pve/0044-PVE-add-query_proxmox_support-QMP-command.patch +++ b/debian/patches/pve/0044-PVE-add-query_proxmox_support-QMP-command.patch @@ -16,7 +16,7 @@ Signed-off-by: Stefan Reiter 2 files changed, 33 insertions(+) diff --git a/pve-backup.c b/pve-backup.c -index bfb648d6b5..6bf138cfc6 100644 +index bfb648d6b5..ba9d0d8a86 100644 --- a/pve-backup.c +++ b/pve-backup.c @@ -1051,3 +1051,11 @@ BackupStatus *qmp_query_backup(Error **errp) diff --git a/debian/patches/pve/0045-pbs-fix-missing-crypt-and-compress-parameters.patch b/debian/patches/pve/0045-pbs-fix-missing-crypt-and-compress-parameters.patch index 34b0f51..d4a03be 100644 --- a/debian/patches/pve/0045-pbs-fix-missing-crypt-and-compress-parameters.patch +++ b/debian/patches/pve/0045-pbs-fix-missing-crypt-and-compress-parameters.patch @@ -9,7 +9,7 @@ Signed-off-by: Wolfgang Bumiller 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pve-backup.c b/pve-backup.c -index 6bf138cfc6..cd3a132d8b 100644 +index ba9d0d8a86..e1dcf10a45 100644 --- a/pve-backup.c +++ b/pve-backup.c @@ -958,6 +958,8 @@ UuidInfo *qmp_backup( diff --git a/debian/patches/pve/0046-PVE-handle-PBS-write-callback-with-big-blocks-correc.patch b/debian/patches/pve/0046-PVE-handle-PBS-write-callback-with-big-blocks-correc.patch index d45a455..7457eb6 100644 --- a/debian/patches/pve/0046-PVE-handle-PBS-write-callback-with-big-blocks-correc.patch +++ b/debian/patches/pve/0046-PVE-handle-PBS-write-callback-with-big-blocks-correc.patch @@ -17,7 +17,7 @@ Signed-off-by: Stefan Reiter 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/pve-backup.c b/pve-backup.c -index cd3a132d8b..f14273645a 100644 +index e1dcf10a45..3eba85506a 100644 --- a/pve-backup.c +++ b/pve-backup.c @@ -67,6 +67,7 @@ opts_init(pvebackup_init); diff --git a/debian/patches/pve/0047-PVE-add-zero-block-handling-to-PBS-dump-callback.patch b/debian/patches/pve/0047-PVE-add-zero-block-handling-to-PBS-dump-callback.patch index 930ec8f..3bb6b35 100644 --- a/debian/patches/pve/0047-PVE-add-zero-block-handling-to-PBS-dump-callback.patch +++ b/debian/patches/pve/0047-PVE-add-zero-block-handling-to-PBS-dump-callback.patch @@ -20,7 +20,7 @@ Signed-off-by: Stefan Reiter 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pve-backup.c b/pve-backup.c -index f14273645a..bd802c6205 100644 +index 3eba85506a..40c2697b37 100644 --- a/pve-backup.c +++ b/pve-backup.c @@ -8,6 +8,7 @@ diff --git a/debian/patches/pve/0048-PVE-add-query-pbs-bitmap-info-QMP-call.patch b/debian/patches/pve/0048-PVE-add-query-pbs-bitmap-info-QMP-call.patch index 54f1dfa..f011610 100644 --- a/debian/patches/pve/0048-PVE-add-query-pbs-bitmap-info-QMP-call.patch +++ b/debian/patches/pve/0048-PVE-add-query-pbs-bitmap-info-QMP-call.patch @@ -68,7 +68,7 @@ index 3ff014d32a..c3227a1498 100644 info->zero_bytes, zero_per); diff --git a/pve-backup.c b/pve-backup.c -index bd802c6205..2db4a62580 100644 +index 40c2697b37..1e7b92a950 100644 --- a/pve-backup.c +++ b/pve-backup.c @@ -46,6 +46,7 @@ static struct PVEBackupState { diff --git a/debian/patches/pve/0049-PVE-redirect-stderr-to-journal-when-daemonized.patch b/debian/patches/pve/0049-PVE-redirect-stderr-to-journal-when-daemonized.patch index 1d54282..ae92ff4 100644 --- a/debian/patches/pve/0049-PVE-redirect-stderr-to-journal-when-daemonized.patch +++ b/debian/patches/pve/0049-PVE-redirect-stderr-to-journal-when-daemonized.patch @@ -1,6 +1,6 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Stefan Reiter -Date: Tue, 30 Jun 2020 13:10:10 +0200 +Date: Tue, 12 Jan 2021 14:12:20 +0100 Subject: [PATCH] PVE: redirect stderr to journal when daemonized QEMU uses the logging for error messages usually, so LOG_ERR is most @@ -13,13 +13,13 @@ Signed-off-by: Stefan Reiter 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile.objs b/Makefile.objs -index 240eb503f2..c7ba4e11e7 100644 +index 3c22019042..744c26d3b0 100644 --- a/Makefile.objs +++ b/Makefile.objs -@@ -54,6 +54,7 @@ common-obj-y += net/ - common-obj-y += qdev-monitor.o - common-obj-$(CONFIG_WIN32) += os-win32.o +@@ -56,6 +56,7 @@ common-obj-$(CONFIG_WIN32) += os-win32.o common-obj-$(CONFIG_POSIX) += os-posix.o + vma-writer.o-libs := -luuid + pve-backup.o-libs := -luuid +os-posix.o-libs := -lsystemd common-obj-$(CONFIG_LINUX) += fsdev/ diff --git a/debian/patches/pve/0051-PVE-Backup-Use-a-transaction-to-synchronize-job-stat.patch b/debian/patches/pve/0051-PVE-Backup-Use-a-transaction-to-synchronize-job-stat.patch index daa2498..bb3b026 100644 --- a/debian/patches/pve/0051-PVE-Backup-Use-a-transaction-to-synchronize-job-stat.patch +++ b/debian/patches/pve/0051-PVE-Backup-Use-a-transaction-to-synchronize-job-stat.patch @@ -16,7 +16,7 @@ Signed-off-by: Stefan Reiter 1 file changed, 49 insertions(+), 118 deletions(-) diff --git a/pve-backup.c b/pve-backup.c -index 2db4a62580..b52f4a9364 100644 +index 1e7b92a950..f3df43eb8c 100644 --- a/pve-backup.c +++ b/pve-backup.c @@ -52,6 +52,7 @@ static struct PVEBackupState { diff --git a/debian/patches/pve/0052-PVE-Backup-Use-more-coroutines-and-don-t-block-on-fi.patch b/debian/patches/pve/0052-PVE-Backup-Use-more-coroutines-and-don-t-block-on-fi.patch index 49213d9..556890f 100644 --- a/debian/patches/pve/0052-PVE-Backup-Use-more-coroutines-and-don-t-block-on-fi.patch +++ b/debian/patches/pve/0052-PVE-Backup-Use-more-coroutines-and-don-t-block-on-fi.patch @@ -38,7 +38,7 @@ Signed-off-by: Stefan Reiter 2 files changed, 95 insertions(+), 58 deletions(-) diff --git a/pve-backup.c b/pve-backup.c -index b52f4a9364..4402c0cb17 100644 +index f3df43eb8c..f3b8ce1f3a 100644 --- a/pve-backup.c +++ b/pve-backup.c @@ -33,7 +33,9 @@ const char *PBS_BITMAP_NAME = "pbs-incremental-dirty-bitmap"; diff --git a/debian/patches/pve/0053-PVE-fix-and-clean-up-error-handling-for-create_backu.patch b/debian/patches/pve/0053-PVE-fix-and-clean-up-error-handling-for-create_backu.patch index 873fd37..92dc3e0 100644 --- a/debian/patches/pve/0053-PVE-fix-and-clean-up-error-handling-for-create_backu.patch +++ b/debian/patches/pve/0053-PVE-fix-and-clean-up-error-handling-for-create_backu.patch @@ -22,7 +22,7 @@ Signed-off-by: Stefan Reiter 1 file changed, 54 insertions(+), 25 deletions(-) diff --git a/pve-backup.c b/pve-backup.c -index 4402c0cb17..c7cde0fb0e 100644 +index f3b8ce1f3a..ded90cb822 100644 --- a/pve-backup.c +++ b/pve-backup.c @@ -50,6 +50,7 @@ static struct PVEBackupState { diff --git a/debian/patches/pve/0055-PVE-Migrate-dirty-bitmap-state-via-savevm.patch b/debian/patches/pve/0055-PVE-Migrate-dirty-bitmap-state-via-savevm.patch index 1c64645..f325c0a 100644 --- a/debian/patches/pve/0055-PVE-Migrate-dirty-bitmap-state-via-savevm.patch +++ b/debian/patches/pve/0055-PVE-Migrate-dirty-bitmap-state-via-savevm.patch @@ -159,7 +159,7 @@ index 0000000000..29f2b3860d + NULL); +} diff --git a/pve-backup.c b/pve-backup.c -index c7cde0fb0e..f65f1dda26 100644 +index ded90cb822..6b25292ba1 100644 --- a/pve-backup.c +++ b/pve-backup.c @@ -1130,5 +1130,6 @@ ProxmoxSupportStatus *qmp_query_proxmox_support(Error **errp) -- 2.20.1