Proxmox/qemu-server
5
0
Fork 0
mirror of git://git.proxmox.com/git/qemu-server.git synced 2025-01-11 05:17:57 +03:00
Code Releases Activity

memory: refactor sockets

Browse Source 
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier 2023-02-13 13:00:08 +01:00 committed by Fiona Ebner
parent 6eabfbd15f
commit d82ae201ac
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PVE/QemuServer/Memory.pm
View File

@ -165,8 +165,7 @@ sub qemu_memory_hotplug {
return $value if !PVE::QemuServer::check_running($vmid);
my $sockets = 1;
$sockets = $conf->{sockets} if $conf->{sockets};
my $sockets = $conf->{sockets} || 1;
my $memory = $conf->{memory} || $defaults->{memory};
$value = $defaults->{memory} if !$value;
@ -289,8 +288,7 @@ sub config {
if $conf->{"numa$i"};
}
my $sockets = 1;
$sockets = $conf->{sockets} if $conf->{sockets};
my $sockets = $conf->{sockets} || 1;
$static_memory = $STATICMEM;
$static_memory = $static_memory * $sockets if ($conf->{hugepages} && $conf->{hugepages} == 1024);
@ -501,9 +499,7 @@ sub hugepages_topology {
my $defaults = PVE::QemuServer::load_defaults();
my $memory = $conf->{memory} || $defaults->{memory};
my $static_memory = 0;
my $sockets = 1;
$sockets = $conf->{smp} if $conf->{smp}; # old style - no longer iused
$sockets = $conf->{sockets} if $conf->{sockets};
my $sockets = $conf->{sockets} || 1;
my $numa_custom_topology = undef;
my $hotplug_features = PVE::QemuServer::parse_hotplug_features(defined($conf->{hotplug}) ? $conf->{hotplug} : '1');