On 16/04/2024 14:20, Fabian Grünbichler wrote:

> 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 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'",



nit: consistency with "amount of memory"



> +	type => 'integer',

> +	optional => 1,

> +	renderer => 'bytes',

> +    },

> +    runmem => {

> +	description => "Currently plugged memory in bytes, if running.",



for consistency's sake we could also use "configured" instead of

"plugged" memory here (similar to pve-container).



nit: consistency with "amount of memory"



> +	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.",



same comment as for the pve-container: "configured" instead of "used".



> +	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});

> +	



Git complained about this line:



Applying: vmstatus: add usage values for pool limits

.git/rebase-apply/patch:58: trailing whitespace.



warning: 1 line adds whitespace errors.



>  	$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