[pve-devel] applied: [PATCH v3 qemu-server 03/13] qemu_memory_hotplug: remove unused $opt arg

Fiona Ebner f.ebner at proxmox.com
Fri Feb 3 14:56:37 CET 2023


Am 02.02.23 um 12:03 schrieb Alexandre Derumier:
> Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
> ---
>  PVE/QemuServer.pm        | 4 ++--
>  PVE/QemuServer/Memory.pm | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
> index e4d1a70..a0e16dc 100644
> --- a/PVE/QemuServer.pm
> +++ b/PVE/QemuServer.pm
> @@ -5046,7 +5046,7 @@ 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);
> +		PVE::QemuServer::Memory::qemu_memory_hotplug($vmid, $conf, $defaults);
>  	    } elsif ($opt eq 'cpuunits') {
>  		$cgroup->change_cpu_shares(undef);
>  	    } elsif ($opt eq 'cpulimit') {
> @@ -5121,7 +5121,7 @@ sub vmconfig_hotplug_pending {
>  				     $vmid, $opt, $value, $arch, $machine_type);
>  	    } elsif ($opt =~ m/^memory$/) { #dimms
>  		die "skip\n" if !$hotplug_features->{memory};
> -		$value = PVE::QemuServer::Memory::qemu_memory_hotplug($vmid, $conf, $defaults, $opt, $value);
> +		$value = PVE::QemuServer::Memory::qemu_memory_hotplug($vmid, $conf, $defaults, $value);
>  	    } elsif ($opt eq 'cpuunits') {
>  		my $new_cpuunits = PVE::CGroup::clamp_cpu_shares($conf->{pending}->{$opt}); #clamp
>  		$cgroup->change_cpu_shares($new_cpuunits);
> diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm
> index 5a7c1b7..6bb931e 100644
> --- a/PVE/QemuServer/Memory.pm
> +++ b/PVE/QemuServer/Memory.pm
> @@ -155,7 +155,7 @@ sub foreach_reverse_dimm {
>  }
>  
>  sub qemu_memory_hotplug {
> -    my ($vmid, $conf, $defaults, $opt, $value) = @_;
> +    my ($vmid, $conf, $defaults, $value) = @_;
>  
>      return $value if !PVE::QemuServer::check_running($vmid);
>  

applied this one, thanks!





More information about the pve-devel mailing list