[pve-devel] [PATCH v3 qemu 2/3] Use already defined G_GNUC_PRINTF macro
Filip Schauer
f.schauer at proxmox.com
Mon Aug 7 14:38:52 CEST 2023
Use the G_GNUC_PRINTF macro that QEMU already defines instead of
redefining it under a different name.
Signed-off-by: Filip Schauer <f.schauer at proxmox.com>
---
...vevm-async-for-background-state-snapshots.patch | 14 ++------------
...027-PVE-Backup-add-vma-backup-format-code.patch | 14 ++------------
2 files changed, 4 insertions(+), 24 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 68c5627..3dbbf18 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,544 @@
+@@ -0,0 +1,534 @@
+#include "qemu/osdep.h"
+#include "migration/channel-savevm-async.h"
+#include "migration/migration.h"
@@ -177,16 +177,6 @@ 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,
@@ -285,7 +275,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, ...) G_GNUC_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 5dcd866..3c3ac54 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
@@ -2622,7 +2622,7 @@ new file mode 100644
index 0000000000..1b62859165
--- /dev/null
+++ b/vma.h
-@@ -0,0 +1,160 @@
+@@ -0,0 +1,150 @@
+/*
+ * VMA: Virtual Machine Archive
+ *
@@ -2643,16 +2643,6 @@ 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<<VMA_BLOCK_BITS)
+#define VMA_CLUSTER_BITS (VMA_BLOCK_BITS+4)
@@ -2767,7 +2757,7 @@ index 0000000000..1b62859165
+int coroutine_fn vma_writer_flush_output(VmaWriter *vmaw);
+
+int vma_writer_get_status(VmaWriter *vmaw, VmaStatus *status);
-+void vma_writer_set_error(VmaWriter *vmaw, const char *fmt, ...) PRINTF(2, 3);
++void vma_writer_set_error(VmaWriter *vmaw, const char *fmt, ...) G_GNUC_PRINTF(2, 3);
+
+
+VmaReader *vma_reader_create(const char *filename, Error **errp);
--
2.39.2
More information about the pve-devel
mailing list