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 4D535E6F8 for ; Fri, 9 Dec 2022 20:28:09 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0EFE72730B for ; Fri, 9 Dec 2022 20:27:39 +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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Fri, 9 Dec 2022 20:27:37 +0100 (CET) Received: from kvmformation3.odiso.net (formationkvm3.odiso.net [10.3.94.12]) by bastionodiso.odiso.net (Postfix) with ESMTP id D6A1DA8D0; Fri, 9 Dec 2022 20:27:28 +0100 (CET) Received: by kvmformation3.odiso.net (Postfix, from userid 0) id D56EBFC3BB; Fri, 9 Dec 2022 20:27:28 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com, t.lamprecht@proxmox.com Date: Fri, 9 Dec 2022 20:27:26 +0100 Message-Id: <20221209192726.1499142-11-aderumier@odiso.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221209192726.1499142-1-aderumier@odiso.com> References: <20221209192726.1499142-1-aderumier@odiso.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.030 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 qemu-server 10/10] memory: fix hotplug with virtiomem && maxmem 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: Fri, 09 Dec 2022 19:28:09 -0000 Signed-off-by: Alexandre Derumier --- PVE/QemuServer.pm | 9 ++++----- PVE/QemuServer/Memory.pm | 23 ++++++++++++++++------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index 43fab29..549e448 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -5081,7 +5081,8 @@ sub vmconfig_hotplug_pending { vmconfig_delete_or_detach_drive($vmid, $storecfg, $conf, $opt, $force); } elsif ($opt =~ m/^memory$/) { die "skip\n" if !$hotplug_features->{memory}; - PVE::QemuServer::Memory::qemu_memory_hotplug($vmid, $conf, $defaults, $opt); + my $new_mem = PVE::QemuServer::parse_memory(); + PVE::QemuServer::Memory::qemu_memory_hotplug($vmid, $conf, $new_mem); } elsif ($opt eq 'cpuunits') { $cgroup->change_cpu_shares(undef); } elsif ($opt eq 'cpulimit') { @@ -5157,10 +5158,8 @@ sub vmconfig_hotplug_pending { $vmid, $opt, $value, $arch, $machine_type); } elsif ($opt =~ m/^memory$/) { #dimms die "skip\n" if !$hotplug_features->{memory}; - my $memory = get_current_memory($conf->{pending}); - my $result = {}; - $result->{current} = PVE::QemuServer::Memory::qemu_memory_hotplug($vmid, $conf, $defaults, $opt, $memory); - $value = PVE::QemuServer::print_memory($result); + my $new_mem = PVE::QemuServer::parse_memory($conf->{pending}->{memory}); + PVE::QemuServer::Memory::qemu_memory_hotplug($vmid, $conf, $new_mem); } elsif ($opt eq 'cpuunits') { my $new_cpuunits = PVE::CGroup::clamp_cpu_shares($conf->{pending}->{$opt}); #clamp diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm index 70ab65a..84a9126 100644 --- a/PVE/QemuServer/Memory.pm +++ b/PVE/QemuServer/Memory.pm @@ -9,6 +9,7 @@ use PVE::Exception qw(raise raise_param_exc); use PVE::QemuServer; use PVE::QemuServer::Monitor qw(mon_cmd); use PVE::QemuServer::PCI qw(print_pci_addr); +use PVE::GuestHelpers qw(safe_string_ne safe_num_ne safe_boolean_ne); use base qw(Exporter); @@ -230,24 +231,32 @@ sub foreach_reverse_dimm { } sub qemu_memory_hotplug { - my ($vmid, $conf, $defaults, $opt, $value) = @_; + my ($vmid, $conf, $new_mem) = @_; - return $value if !PVE::QemuServer::check_running($vmid); + return if !PVE::QemuServer::check_running($vmid); - my $sockets = 1; - $sockets = $conf->{sockets} if $conf->{sockets}; + my $confmem = PVE::QemuServer::parse_memory($conf->{memory}); + + # skip non hotpluggable value + if (safe_string_ne($new_mem->{max}, $confmem->{max}) || + safe_boolean_ne($new_mem->{virtio}, $confmem->{virtio})) { + die "skip\n"; + } + + my $value = $new_mem->{current}; + my $memory = $confmem->{current}; - my $memory = get_current_memory($conf); return $value if $value == $memory; + my $sockets = 1; + $sockets = $conf->{sockets} if $conf->{sockets}; + 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); die "you cannot add more memory than max mem $MAX_MEM MB!\n" if $value > $MAX_MEM; - my $confmem = PVE::QemuServer::parse_memory($conf->{memory}); - if ($confmem->{virtio}) { my $blocksize = get_virtiomem_block_size($conf); my $requested_size = ($value - $static_memory) / $sockets * 1024 * 1024; -- 2.30.2