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 977749F63 for ; Tue, 29 Aug 2023 14:11:04 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 712B88EBF for ; Tue, 29 Aug 2023 14:10:34 +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 ; Tue, 29 Aug 2023 14:10:33 +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 4DCD3474A9 for ; Tue, 29 Aug 2023 14:10:33 +0200 (CEST) Message-ID: Date: Tue, 29 Aug 2023 14:10:28 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 To: Proxmox VE development discussion , Filip Schauer References: <20230809140816.102070-1-f.schauer@proxmox.com> Content-Language: en-US From: Fiona Ebner In-Reply-To: <20230809140816.102070-1-f.schauer@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 1.011 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 NICE_REPLY_A -2.169 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [gtk.org] Subject: Re: [pve-devel] [PATCH v4 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: Tue, 29 Aug 2023 12:11:04 -0000 Am 09.08.23 um 16:08 schrieb Filip Schauer: > 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..312727d 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 Needs a rebase, because the index changed. I would've fixed it up while applying, but I got two more suggestions: > @@ -1928,6 +1929,9 @@ index 0000000000..304f02bc84 > + case 'h': > + help(); > + break; > ++ case 'd': > ++ drive_list = optarg; I think we can use g_strsplit() here already to split the string and then just iterate over the result below, rather than splitting manually for each iteration. Note that you need to free the result at the very end as mentioned in the docs: https://docs.gtk.org/glib/func.strsplit.html > ++ break; > + case 'r': > + readmap = optarg; > + break; (...) > @@ -2089,7 +2093,34 @@ index 0000000000..304f02bc84 > + > + BlockBackend *blk = NULL; > + > -+ if (readmap) { > ++ if (drive_list) { > ++ skip = true; > ++ size_t devname_len = strlen(di->devname); > ++ const char *token = drive_list; > ++ while (*token) { > ++ const char *comma = strchr(token, ','); > ++ if (comma == NULL) { > ++ comma = token + strlen(token); > ++ } > ++ > ++ size_t token_len = comma - token; > ++ if (token_len == devname_len && strncmp(token, di->devname, token_len) == 0) { Passing devname_len to strncmp would avoid the token_len variable.