[pve-devel] [PATCH qemu-server 10/10] memory: fix hotplug with virtiomem && maxmem

[Alexandre Derumier <aderumier@odiso.com>]

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---
 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