From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 38D471FF17C for ; Wed, 23 Jul 2025 13:57:26 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 558C1FF16; Wed, 23 Jul 2025 13:58:45 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Wed, 23 Jul 2025 13:57:36 +0200 Message-ID: <20250723115809.96282-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250723115809.96282-1-f.ebner@proxmox.com> References: <20250723115809.96282-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753271882038 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.027 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [jsonschema.pm] Subject: [pve-devel] [PATCH common v3 1/6] schema: support sizes with verbose suffixes {K, M, G, T}iB 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" The single-letter suffixes are ambiguous and especially in the context of disks, the powers of ten are usually used. Proxmox VE uses multiples of 1024 however. This is in preparation to adapt format_size() to prefer the verbose suffixes which is planned for Proxmox VE 9. The single-letter suffixes stay supported for backwards-compatibility for API/CLI users as well as parsing backup configurations. The function is currently also used for parsing the 'target-size' Ceph pool option (still restricted via schema to single-letter suffixes). Signed-off-by: Fiona Ebner --- NOTE: should also be applied for Proxmox VE 8. src/PVE/JSONSchema.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/PVE/JSONSchema.pm b/src/PVE/JSONSchema.pm index 43e0ca0..e7c366f 100644 --- a/src/PVE/JSONSchema.pm +++ b/src/PVE/JSONSchema.pm @@ -990,16 +990,16 @@ sub check_format { sub parse_size { my ($value) = @_; - return undef if $value !~ m/^(\d+(\.\d+)?)([KMGT])?$/; + return undef if $value !~ m/^(\d+(\.\d+)?)([KMGT](?:iB)?)?$/; my ($size, $unit) = ($1, $3); if ($unit) { - if ($unit eq 'K') { + if ($unit eq 'K' || $unit eq 'KiB') { $size = $size * 1024; - } elsif ($unit eq 'M') { + } elsif ($unit eq 'M' || $unit eq 'MiB') { $size = $size * 1024 * 1024; - } elsif ($unit eq 'G') { + } elsif ($unit eq 'G' || $unit eq 'GiB') { $size = $size * 1024 * 1024 * 1024; - } elsif ($unit eq 'T') { + } elsif ($unit eq 'T' || $unit eq 'TiB') { $size = $size * 1024 * 1024 * 1024 * 1024; } } -- 2.47.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel