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 5488896C54 for ; Tue, 16 Apr 2024 14:21:13 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4FE881A79D for ; Tue, 16 Apr 2024 14:21:12 +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 ; Tue, 16 Apr 2024 14:21:11 +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 8C68E450C6 for ; Tue, 16 Apr 2024 14:21:11 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Tue, 16 Apr 2024 14:20:50 +0200 Message-Id: <20240416122054.733817-16-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240416122054.733817-1-f.gruenbichler@proxmox.com> References: <20240416122054.733817-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.056 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 v2 qemu-server 2/6] vmstatus: add usage values for pool limits 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, 16 Apr 2024 12:21:13 -0000 these are separate from the existing ones to allow changes on either end without side-effects, since the semantics are not quite the same. the conf values incorporate pending values (if higher than the current config value), and avoid clamping. the run values are currently identical to the regular ones. Signed-off-by: Fabian Grünbichler --- PVE/QemuServer.pm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 661613df..93eaaec5 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -2755,6 +2755,18 @@ our $vmstatus_return_properties = { optional => 1, renderer => 'bytes', }, + confmem => { + description => "Configured memory in bytes, might be higher than 'maxmem'", + type => 'integer', + optional => 1, + renderer => 'bytes', + }, + runmem => { + description => "Currently plugged memory in bytes, if running.", + type => 'integer', + optional => 1, + renderer => 'bytes', + }, maxdisk => { description => "Root disk size in bytes.", type => 'integer', @@ -2787,6 +2799,16 @@ our $vmstatus_return_properties = { type => 'number', optional => 1, }, + confcpus => { + description => "Configured amount of CPUs, might be higher than 'cpus'.", + type => 'number', + optional => 1, + }, + runcpus => { + description => "Currently used amount of CPUs.", + type => 'number', + optional => 1, + }, lock => { description => "The current config lock, if any.", type => 'string', @@ -2839,6 +2861,8 @@ sub vmstatus { # fixme: better status? $d->{status} = $list->{$vmid}->{pid} ? 'running' : 'stopped'; + my $usage = PVE::QemuConfig->get_pool_usage($conf); + my $size = PVE::QemuServer::Drive::bootdisk_size($storecfg, $conf); if (defined($size)) { $d->{disk} = 0; # no info available @@ -2850,11 +2874,16 @@ sub vmstatus { $d->{cpus} = ($conf->{sockets} || $defaults->{sockets}) * ($conf->{cores} || $defaults->{cores}); + $d->{cpus} = $cpucount if $d->{cpus} > $cpucount; $d->{cpus} = $conf->{vcpus} if $conf->{vcpus}; + $d->{confcpus} = $usage->{cpu}; + $d->{runcpus} = $d->{cpus}; $d->{name} = $conf->{name} || "VM $vmid"; $d->{maxmem} = get_current_memory($conf->{memory})*(1024*1024); + $d->{confmem} = $usage->{mem}; + $d->{runmem} = $d->{maxmem}; if ($conf->{balloon}) { $d->{balloon_min} = $conf->{balloon}*(1024*1024); -- 2.39.2