From f42ba1f272e517ac920ca38f15c06309b38c58ef Mon Sep 17 00:00:00 2001 From: Fiona Ebner Date: Mon, 13 Jan 2025 14:00:50 +0100 Subject: [PATCH] vma reader: drop unused variable The variable has been unused since commit 67af0fa ("rebased pve patches") back in 2017. There is no comment to why, but before that, it was used to error out if there were no disks in the vma archive. This should be possible however, so it's safe to assume this was an intentional change. This fixes compilation with clang19. Signed-off-by: Fiona Ebner --- .../0027-PVE-Backup-add-vma-backup-format-code.patch | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) 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 0f197ba..e679ec6 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 @@ -15,11 +15,11 @@ Signed-off-by: Fiona Ebner --- block/meson.build | 2 + meson.build | 5 + - vma-reader.c | 870 ++++++++++++++++++++++++++++++++++++++++++++ + vma-reader.c | 868 ++++++++++++++++++++++++++++++++++++++++++++ vma-writer.c | 817 +++++++++++++++++++++++++++++++++++++++++ vma.c | 901 ++++++++++++++++++++++++++++++++++++++++++++++ vma.h | 150 ++++++++ - 6 files changed, 2745 insertions(+) + 6 files changed, 2743 insertions(+) create mode 100644 vma-reader.c create mode 100644 vma-writer.c create mode 100644 vma.c @@ -63,10 +63,10 @@ index aa7ea85d0b..7eee5b4249 100644 foreach exe: [ 'qemu-img', 'qemu-io', 'qemu-nbd', 'qemu-storage-daemon'] diff --git a/vma-reader.c b/vma-reader.c new file mode 100644 -index 0000000000..d0b6721812 +index 0000000000..65015d2e1e --- /dev/null +++ b/vma-reader.c -@@ -0,0 +1,870 @@ +@@ -0,0 +1,868 @@ +/* + * VMA: Virtual Machine Archive + * @@ -381,7 +381,6 @@ index 0000000000..d0b6721812 + } + + -+ int count = 0; + for (i = 1; i < 256; i++) { + VmaDeviceInfoHeader *dih = &h->dev_info[i]; + uint32_t devname_ptr = GUINT32_FROM_BE(dih->devname_ptr); @@ -389,7 +388,6 @@ index 0000000000..d0b6721812 + const char *devname = get_header_str(vmar, devname_ptr); + + if (size && devname) { -+ count++; + vmar->devinfo[i].size = size; + vmar->devinfo[i].devname = devname; +