Signed-off-by: Alexandre Derumier <aderum...@odiso.com>
---
PVE/QemuServer/Memory.pm | 50 ++++++++++++++++++++++++----------------
1 file changed, 30 insertions(+), 20 deletions(-)
diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm
index 668508b..90e355b 100644
--- a/PVE/QemuServer/Memory.pm
+++ b/PVE/QemuServer/Memory.pm
@@ -15,7 +15,33 @@ get_current_memory
);
my $MAX_NUMA = 8;
-my $STATICMEM = 1024;
+
+my sub get_static_mem {
+ my ($conf) = @_;
+
+ my $sockets = 1;
+ $sockets = $conf->{smp} if $conf->{smp}; # old style - no longer iused
+ $sockets = $conf->{sockets} if $conf->{sockets};
+ my $hotplug_features =
PVE::QemuServer::parse_hotplug_features(defined($conf->{hotplug}) ?
$conf->{hotplug} : '1');
+
+ my $static_memory = 0;
+ my $memory = PVE::QemuServer::parse_memory($conf->{memory});
+
+ if($memory->{max}) {
+ my $dimm_size = $memory->{max} / 64;
+ #static mem can't be lower than 4G and lower than 1 dimmsize by socket
+ $static_memory = $dimm_size * $sockets;
+ $static_memory = 4096 if $static_memory < 4096;
+ } elsif ($hotplug_features->{memory}) {
+ #legacy
+ $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;
my sub get_host_phys_address_bits {
@@ -177,8 +203,7 @@ sub qemu_memory_hotplug {
my $memory = get_current_memory($conf);
return $value if $value == $memory;
- my $static_memory = $STATICMEM;
- $static_memory = $static_memory * $sockets if ($conf->{hugepages} &&
$conf->{hugepages} == 1024);
+ my $static_memory = get_static_mem($conf);
die "memory can't be lower than $static_memory MB" if $value <
$static_memory;
my $MAX_MEM = get_max_mem($conf);
@@ -288,7 +313,7 @@ sub config {
my $memory = get_current_memory($conf);
- my $static_memory = 0;
+ my $static_memory = get_static_mem($conf);
if ($hotplug_features->{memory}) {
die "NUMA needs to be enabled for memory hotplug\n" if !$conf->{numa};
@@ -300,18 +325,10 @@ sub config {
if $conf->{"numa$i"};
}
- my $sockets = 1;
- $sockets = $conf->{sockets} if $conf->{sockets};
-
- $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;
}
@@ -504,20 +521,13 @@ sub hugepages_topology {
my $defaults = PVE::QemuServer::load_defaults();
my $memory = get_current_memory($conf);
- my $static_memory = 0;
+ my $static_memory = get_static_mem($conf);
my $sockets = 1;
$sockets = $conf->{smp} if $conf->{smp}; # old style - no longer iused
$sockets = $conf->{sockets} if $conf->{sockets};
my $numa_custom_topology = undef;
my $hotplug_features =
PVE::QemuServer::parse_hotplug_features(defined($conf->{hotplug}) ?
$conf->{hotplug} : '1');
- if ($hotplug_features->{memory}) {
- $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.30.2
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
