When checking whether cpu and mem hotplug have already been set, it was not checked whether there is already a hotplug section in the VM config, which results in an uninitialized value error. At the same time, remove unnecessary regex.
Signed-off-by: Hannes Duerr <[email protected]> --- src/PVE/QemuServer.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/PVE/QemuServer.pm b/src/PVE/QemuServer.pm index 45daa06c..9b16d057 100644 --- a/src/PVE/QemuServer.pm +++ b/src/PVE/QemuServer.pm @@ -24,6 +24,7 @@ use Storable qw(dclone); use Time::HiRes qw(gettimeofday usleep); use URI::Escape; use UUID; +use Data::Dumper; use PVE::Cluster qw(cfs_register_file cfs_read_file cfs_write_file); use PVE::CGroup; @@ -4714,9 +4715,9 @@ sub vmconfig_hotplug_pending { eval { if ($opt eq 'hotplug') { die "skip\n" - if ($value =~ /memory/) || ($value !~ /memory/ && $conf->{hotplug} =~ /memory/); + if ($value =~ /cpu/) || ($conf->{hotplug} && $conf->{hotplug} =~ /cpu/); die "skip\n" - if ($value =~ /cpu/) || ($value !~ /cpu/ && $conf->{hotplug} =~ /cpu/); + if ($value =~ /memory/) || ($conf->{hotplug} && $conf->{hotplug} =~ /memory/); } elsif ($opt eq 'tablet') { die "skip\n" if !$hotplug_features->{usb}; if ($value == 1) { -- 2.47.3 _______________________________________________ pve-devel mailing list [email protected] https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
