From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id DBC0D925EF for ; Mon, 13 Feb 2023 13:00:30 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id BD93822418 for ; Mon, 13 Feb 2023 13:00:30 +0100 (CET) Received: from bastionodiso.odiso.net (bastionodiso.odiso.net [IPv6:2a0a:1580:2000::2d]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 13 Feb 2023 13:00:29 +0100 (CET) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id 438F480CA; Mon, 13 Feb 2023 13:00:23 +0100 (CET) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id 333C417A00A; Mon, 13 Feb 2023 13:00:23 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Mon, 13 Feb 2023 13:00:08 +0100 Message-Id: <20230213120021.3783742-4-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230213120021.3783742-1-aderumier@odiso.com> References: <20230213120021.3783742-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.026 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% HEADER_FROM_DIFFERENT_DOMAINS 0.25 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.001 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pve-devel] [PATCH v4 qemu-server 03/16] memory: refactor sockets X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2023 12:00:30 -0000 Signed-off-by: Alexandre Derumier --- PVE/QemuServer/Memory.pm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm index e10c0b7..3899917 100644 --- a/PVE/QemuServer/Memory.pm +++ b/PVE/QemuServer/Memory.pm @@ -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); @@ -499,9 +497,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'); -- 2.30.2