[pve-devel] [PATCH v6 qemu-server 02/10] memory: add get_static_mem
Alexandre Derumier
aderumier at odiso.com
Mon Jun 19 09:28:32 CEST 2023
Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
---
PVE/QemuServer/Memory.pm | 37 +++++++++++++++++++------------------
1 file changed, 19 insertions(+), 18 deletions(-)
diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm
index aaa94cc..12e6ee4 100644
--- a/PVE/QemuServer/Memory.pm
+++ b/PVE/QemuServer/Memory.pm
@@ -15,7 +15,6 @@ get_current_memory
);
my $MAX_NUMA = 8;
-my $STATICMEM = 1024;
our $memory_fmt = {
current => {
@@ -44,6 +43,22 @@ sub parse_memory {
return $res;
}
+my sub get_static_mem {
+ my ($conf, $sockets, $hotplug) = @_;
+
+ my $static_memory = 0;
+ my $memory = parse_memory($conf->{memory});
+
+ if ($hotplug) {
+ $static_memory = 1024;
+ $static_memory = $static_memory * $sockets if ($conf->{hugepages} && $conf->{hugepages} == 1024);
+ } else {
+ $static_memory = $memory->{current};
+ }
+
+ return $static_memory;
+}
+
my $_host_bits;
sub get_host_phys_address_bits {
return $_host_bits if defined($_host_bits);
@@ -181,8 +196,7 @@ sub qemu_memory_hotplug {
$value = $newmem->{current};
my $sockets = $conf->{sockets} || 1;
- my $static_memory = $STATICMEM;
- $static_memory = $static_memory * $sockets if ($conf->{hugepages} && $conf->{hugepages} == 1024);
+ my $static_memory = get_static_mem($conf, $sockets, 1);
die "memory can't be lower than $static_memory MB" if $value < $static_memory;
my $MAX_MEM = get_max_mem($conf);
@@ -294,7 +308,7 @@ sub config {
my ($conf, $vmid, $sockets, $cores, $hotplug, $cmd) = @_;
my $memory = get_current_memory($conf->{memory});
- my $static_memory = 0;
+ my $static_memory = get_static_mem($conf, $sockets, $hotplug);
if ($hotplug) {
die "NUMA needs to be enabled for memory hotplug\n" if !$conf->{numa};
@@ -306,17 +320,11 @@ sub config {
if $conf->{"numa$i"};
}
- my $sockets = $conf->{sockets} || 1;
-
- $static_memory = $STATICMEM;
- $static_memory = $static_memory * $sockets if ($conf->{hugepages} && $conf->{hugepages} == 1024);
-
die "minimum memory must be ${static_memory}MB\n" if($memory < $static_memory);
push @$cmd, '-m', "size=${static_memory},slots=255,maxmem=${MAX_MEM}M";
} else {
- $static_memory = $memory;
push @$cmd, '-m', $static_memory;
}
@@ -515,17 +523,10 @@ sub hugepages_topology {
return if !$conf->{numa};
my $memory = get_current_memory($conf->{memory});
- my $static_memory = 0;
my $sockets = $conf->{sockets} || 1;
+ my $static_memory = get_static_mem($conf, $sockets, $hotplug);
my $numa_custom_topology = undef;
- if ($hotplug) {
- $static_memory = $STATICMEM;
- $static_memory = $static_memory * $sockets if ($conf->{hugepages} && $conf->{hugepages} == 1024);
- } else {
- $static_memory = $memory;
- }
-
#custom numa topology
for (my $i = 0; $i < $MAX_NUMA; $i++) {
next if !$conf->{"numa$i"};
--
2.39.2
More information about the pve-devel
mailing list