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 37731A259F for ; Mon, 19 Jun 2023 09:29:24 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1DD64252DA for ; Mon, 19 Jun 2023 09:28:54 +0200 (CEST) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [IPv6:2a0a:1580:2000::2d]) (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 ; Mon, 19 Jun 2023 09:28:53 +0200 (CEST) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 3B70E7FC0; Mon, 19 Jun 2023 09:28:45 +0200 (CEST) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 2E5DD24149A; Mon, 19 Jun 2023 09:28:45 +0200 (CEST) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Mon, 19 Jun 2023 09:28:31 +0200 Message-Id: <20230619072841.38531-3-aderumier@odiso.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230619072841.38531-1-aderumier@odiso.com> References: <20230619072841.38531-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.014 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 HEADER_FROM_DIFFERENT_DOMAINS 0.25 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH v2 pve-manager 1/2] ui: qemu: hardware: add new memory format support 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, 19 Jun 2023 07:29:24 -0000 Signed-off-by: Alexandre Derumier --- www/manager6/qemu/HardwareView.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/www/manager6/qemu/HardwareView.js b/www/manager6/qemu/HardwareView.js index af35a980..0b17ef0d 100644 --- a/www/manager6/qemu/HardwareView.js +++ b/www/manager6/qemu/HardwareView.js @@ -77,11 +77,17 @@ Ext.define('PVE.qemu.HardwareView', { renderer: function(value, metaData, record, ri, ci, store, pending) { var res = ''; - var max = me.getObjectValue('memory', 512, pending); + let memory = me.getObjectValue('memory', undefined, pending); + let props = PVE.Parser.parsePropertyString(memory, 'current'); + let current = 512; + if (props.current) { + current = props.current; + } + var balloon = me.getObjectValue('balloon', undefined, pending); var shares = me.getObjectValue('shares', undefined, pending); - res = Proxmox.Utils.format_size(max*1024*1024); + res = Proxmox.Utils.format_size(current*1024*1024); if (balloon !== undefined && balloon > 0) { res = Proxmox.Utils.format_size(balloon*1024*1024) + "/" + res; @@ -92,6 +98,13 @@ Ext.define('PVE.qemu.HardwareView', { } else if (balloon === 0) { res += ' [balloon=0]'; } + if (props.max) { + res += ' [max=' + Proxmox.Utils.format_size(props.max*1024*1024) +']'; + } + if (props.virtio) { + res += ' [virtio=' + props.virtio +']'; + } + return res; }, }, -- 2.39.2