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)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 1C069A2C9 for ; Mon, 7 Aug 2023 12:08:11 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F233433CBB for ; Mon, 7 Aug 2023 12:08:10 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 7 Aug 2023 12:08:10 +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 2866043062 for ; Mon, 7 Aug 2023 12:08:10 +0200 (CEST) From: Filip Schauer To: pve-devel@lists.proxmox.com Date: Mon, 7 Aug 2023 12:08:02 +0200 Message-Id: <20230807100802.328313-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.003 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] fix #1534: vma: Add extract filter for disk images 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 10:08:11 -0000 Add a filter to the "vma extract" command. A wildcard can be passed with "-f" to match disk images that should be extracted. Example to extract all IDE drives from vzdump.vma: vma extract vzdump.vma -f "drive-ide*" extractdir Signed-off-by: Filip Schauer --- ...VE-Backup-add-vma-backup-format-code.patch | 27 ++++++++++++++----- 1 file changed, 21 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 8471a6f..b29d348 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 @@ -1738,7 +1738,7 @@ new file mode 100644 index 0000000000..304f02bc84 --- /dev/null +++ b/vma.c -@@ -0,0 +1,878 @@ +@@ -0,0 +1,893 @@ +/* + * VMA: Virtual Machine Archive + * @@ -1753,6 +1753,7 @@ index 0000000000..304f02bc84 + */ + +#include "qemu/osdep.h" ++#include +#include + +#include "vma.h" @@ -1772,7 +1773,7 @@ index 0000000000..304f02bc84 + "vma list \n" + "vma config [-c config]\n" + "vma create [-c config] pathname ...\n" -+ "vma extract [-r ] \n" ++ "vma extract [-f ] [-r ] \n" + "vma verify [-v]\n" + ; + @@ -1917,9 +1918,10 @@ index 0000000000..304f02bc84 + const char *filename; + const char *dirname; + const char *readmap = NULL; ++ const char *filter = NULL; + + for (;;) { -+ c = getopt(argc, argv, "hvr:"); ++ c = getopt(argc, argv, "hvf:r:"); + if (c == -1) { + break; + } @@ -1928,6 +1930,9 @@ index 0000000000..304f02bc84 + case 'h': + help(); + break; ++ case 'f': ++ filter = optarg; ++ break; + case 'r': + readmap = optarg; + break; @@ -2064,12 +2069,12 @@ index 0000000000..304f02bc84 + + int i; + int vmstate_fd = -1; -+ guint8 vmstate_stream = 0; ++ uint8_t filter_bitmap[256 / 8]; ++ memset(filter_bitmap, 0, sizeof(filter_bitmap)); + + for (i = 1; i < 255; i++) { + VmaDeviceInfo *di = vma_reader_get_device_info(vmar, i); + if (di && (strcmp(di->devname, "vmstate") == 0)) { -+ vmstate_stream = i; + char *statefn = g_strdup_printf("%s/vmstate.bin", dirname); + vmstate_fd = open(statefn, O_WRONLY|O_CREAT|O_EXCL, 0644); + if (vmstate_fd < 0) { @@ -2078,6 +2083,16 @@ index 0000000000..304f02bc84 + } + g_free(statefn); + } else if (di) { ++ if (filter && (fnmatch(filter, di->devname, 0) != 0)) { ++ if (vma_reader_register_bs(vmar, i, NULL, true, true, &errp) < 0) { ++ g_error("%s", error_get_pretty(errp)); ++ } ++ ++ continue; ++ } ++ ++ filter_bitmap[i / 8] |= 1 << (i % 8); ++ + char *devfn = NULL; + const char *format = NULL; + uint64_t throttling_bps = 0; @@ -2190,7 +2205,7 @@ index 0000000000..304f02bc84 + if (!readmap) { + for (i = 1; i < 255; i++) { + VmaDeviceInfo *di = vma_reader_get_device_info(vmar, i); -+ if (di && (i != vmstate_stream)) { ++ if (di && (filter_bitmap[i / 8] & (1 << (i % 8)))) { + char *tmpfn = g_strdup_printf("%s/tmp-disk-%s.raw", + dirname, di->devname); + char *fn = g_strdup_printf("%s/disk-%s.raw", -- 2.39.2