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 1C8D5A164 for ; Mon, 7 Aug 2023 11:19:36 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 04C403336E for ; Mon, 7 Aug 2023 11:19:06 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 for ; Mon, 7 Aug 2023 11:19:04 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id BF3BB42FD4 for ; Mon, 7 Aug 2023 11:19:04 +0200 (CEST) From: Filip Schauer To: pve-devel@lists.proxmox.com Date: Mon, 7 Aug 2023 11:18:29 +0200 Message-Id: <20230807091829.269932-1-f.schauer@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.005 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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 qemu] Add format attributes to function candidates 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, 07 Aug 2023 09:19:36 -0000 Add format attributes to functions that take printf-like arguments. This provides additional compile-time checking that the correct parameters are passed to the functions. This fixes compiler warnings generated by the -Wsuggest-attribute=format flag. Signed-off-by: Filip Schauer --- ...-async-for-background-state-snapshots.patch | 13 ++++++++++++- ...PVE-Backup-add-vma-backup-format-code.patch | 18 ++++++++++++++---- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/debian/patches/pve/0017-PVE-add-savevm-async-for-background-state-snapshots.patch b/debian/patches/pve/0017-PVE-add-savevm-async-for-background-state-snapshots.patch index 7be1af4..68c5627 100644 --- a/debian/patches/pve/0017-PVE-add-savevm-async-for-background-state-snapshots.patch +++ b/debian/patches/pve/0017-PVE-add-savevm-async-for-background-state-snapshots.patch @@ -142,7 +142,7 @@ new file mode 100644 index 0000000000..ac1fac6378 --- /dev/null +++ b/migration/savevm-async.c -@@ -0,0 +1,533 @@ +@@ -0,0 +1,544 @@ +#include "qemu/osdep.h" +#include "migration/channel-savevm-async.h" +#include "migration/migration.h" @@ -177,6 +177,16 @@ index 0000000000..ac1fac6378 + do { } while (0) +#endif + ++#ifdef __GNUC__ ++#if __GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) ++#define PRINTF(i, j) __attribute__((format (gnu_printf, i, j))) ++#else ++#define PRINTF(i, j) __attribute__((format (printf, i, j))) ++#endif ++#else ++#define PRINTF(i, j) ++#endif ++ +enum { + SAVE_STATE_DONE, + SAVE_STATE_ERROR, @@ -275,6 +285,7 @@ index 0000000000..ac1fac6378 + return ret; +} + ++static void save_snapshot_error(const char *fmt, ...) PRINTF(1, 2); +static void save_snapshot_error(const char *fmt, ...) +{ + va_list ap; diff --git a/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch b/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch index 8471a6f..5dcd866 100644 --- a/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch +++ b/debian/patches/pve/0027-PVE-Backup-add-vma-backup-format-code.patch @@ -2314,13 +2314,13 @@ index 0000000000..304f02bc84 + ret = blk_co_preadv(job->target, start * VMA_CLUSTER_SIZE, + readlen, &qiov, 0); + if (ret < 0) { -+ vma_writer_set_error(job->vmaw, "read error", -1); ++ vma_writer_set_error(job->vmaw, "read error"); + goto out; + } + + size_t zb = 0; + if (vma_writer_write(job->vmaw, job->dev_id, start, buf, &zb) < 0) { -+ vma_writer_set_error(job->vmaw, "backup_dump_cb vma_writer_write failed", -1); ++ vma_writer_set_error(job->vmaw, "backup_dump_cb vma_writer_write failed"); + goto out; + } + } @@ -2622,7 +2622,7 @@ new file mode 100644 index 0000000000..1b62859165 --- /dev/null +++ b/vma.h -@@ -0,0 +1,150 @@ +@@ -0,0 +1,160 @@ +/* + * VMA: Virtual Machine Archive + * @@ -2643,6 +2643,16 @@ index 0000000000..1b62859165 +#include "qapi/error.h" +#include "block/block.h" + ++#ifdef __GNUC__ ++#if __GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) ++#define PRINTF(i, j) __attribute__((format (gnu_printf, i, j))) ++#else ++#define PRINTF(i, j) __attribute__((format (printf, i, j))) ++#endif ++#else ++#define PRINTF(i, j) ++#endif ++ +#define VMA_BLOCK_BITS 12 +#define VMA_BLOCK_SIZE (1<