proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-06-14 13:26:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

memory: use static_memory in foreach_dimm

Browse Source 
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier 2023-06-19 09:28:34 +02:00 committed by Fiona Ebner
parent c86d705295
commit a132d50ea3
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PVE/QemuServer/Memory.pm
View File

@ -97,17 +97,15 @@ sub get_numa_guest_to_host_map {
} }
sub foreach_dimm{ sub foreach_dimm{
my ($conf, $vmid, $memory, $sockets, $func) = @_; my ($conf, $vmid, $memory, $static_memory, $func) = @_;
my $dimm_id = 0; my $dimm_id = 0;
my $current_size = 0; my $current_size = $static_memory;
my $dimm_size = 0; my $dimm_size = 0;
if($conf->{hugepages} && $conf->{hugepages} == 1024) { if($conf->{hugepages} && $conf->{hugepages} == 1024) {
$current_size = 1024 * $sockets;
$dimm_size = 1024; $dimm_size = 1024;
} else { } else {
$current_size = 1024;
$dimm_size = 512; $dimm_size = 512;
} }
@ -150,7 +148,7 @@ sub qemu_memory_hotplug {
my $numa_hostmap; my $numa_hostmap;
foreach_dimm($conf, $vmid, $value, $sockets, sub { foreach_dimm($conf, $vmid, $value, $static_memory, sub {
my ($conf, $vmid, $name, $dimm_size, $numanode, $current_size, $memory) = @_; my ($conf, $vmid, $name, $dimm_size, $numanode, $current_size, $memory) = @_;
return if $current_size <= $conf->{memory}; return if $current_size <= $conf->{memory};
@ -341,7 +339,7 @@ sub config {
} }
if ($hotplug) { if ($hotplug) {
foreach_dimm($conf, $vmid, $memory, $sockets, sub { foreach_dimm($conf, $vmid, $memory, $static_memory, sub {
my ($conf, $vmid, $name, $dimm_size, $numanode, $current_size, $memory) = @_; my ($conf, $vmid, $name, $dimm_size, $numanode, $current_size, $memory) = @_;
my $mem_object = print_mem_object($conf, "mem-$name", $dimm_size); my $mem_object = print_mem_object($conf, "mem-$name", $dimm_size);
@ -515,7 +513,7 @@ sub hugepages_topology {
if ($hotplug) { if ($hotplug) {
my $numa_hostmap = get_numa_guest_to_host_map($conf); my $numa_hostmap = get_numa_guest_to_host_map($conf);
foreach_dimm($conf, undef, $memory, $sockets, sub { foreach_dimm($conf, undef, $memory, $static_memory, sub {
my ($conf, undef, $name, $dimm_size, $numanode, $current_size, $memory) = @_; my ($conf, undef, $name, $dimm_size, $numanode, $current_size, $memory) = @_;
$numanode = $numa_hostmap->{$numanode}; $numanode = $numa_hostmap->{$numanode};