From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <f.gruenbichler@proxmox.com>
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 8C15B945A2
for <pve-devel@lists.proxmox.com>; Wed, 10 Apr 2024 15:13:35 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 4C56F10633
for <pve-devel@lists.proxmox.com>; Wed, 10 Apr 2024 15:13: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))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS
for <pve-devel@lists.proxmox.com>; Wed, 10 Apr 2024 15:13: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 7E2AF43B0C
for <pve-devel@lists.proxmox.com>; Wed, 10 Apr 2024 15:13:33 +0200 (CEST)
From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Wed, 10 Apr 2024 15:13:12 +0200
Message-Id: <20240410131316.1208679-16-f.gruenbichler@proxmox.com>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20240410131316.1208679-1-f.gruenbichler@proxmox.com>
References: <20240410131316.1208679-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.057 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-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 <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Wed, 10 Apr 2024 13:13:35 -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 <f.gruenbichler@proxmox.com>
---
PVE/QemuServer.pm | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 6e2c8052..96652abe 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -2762,6 +2762,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',
@@ -2794,6 +2806,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',
@@ -2846,6 +2868,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
@@ -2857,11 +2881,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