proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-06-21 19:58:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

memory hotplug option is not hotpluggable

Browse Source 
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier 2015-02-09 16:47:52 +01:00 committed by Dietmar Maurer
parent 3605aaa626
commit 51a6f637d2
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PVE/QemuServer.pm
View File

@ -3746,7 +3746,6 @@ sub set_migration_caps {
my $fast_plug_option = { my $fast_plug_option = {
'name' => 1, 'name' => 1,
'hotplug' => 1,
'onboot' => 1, 'onboot' => 1,
'shares' => 1, 'shares' => 1,
'startup' => 1, 'startup' => 1,
@ -3790,7 +3789,9 @@ sub vmconfig_hotplug_pending {
foreach my $opt (@delete) { foreach my $opt (@delete) {
next if $selection && !$selection->{$opt}; next if $selection && !$selection->{$opt};
eval { eval {
if ($opt eq 'tablet') { if ($opt eq 'hotplug') {
die "skip\n" if ($conf->{hotplug} =~ /memory/);
} elsif ($opt eq 'tablet') {
die "skip\n" if !$hotplug_features->{usb}; die "skip\n" if !$hotplug_features->{usb};
if ($defaults->{tablet}) { if ($defaults->{tablet}) {
vm_deviceplug($storecfg, $conf, $vmid, $opt); vm_deviceplug($storecfg, $conf, $vmid, $opt);
@ -3834,7 +3835,9 @@ sub vmconfig_hotplug_pending {
next if $selection && !$selection->{$opt}; next if $selection && !$selection->{$opt};
my $value = $conf->{pending}->{$opt}; my $value = $conf->{pending}->{$opt};
eval { eval {
if ($opt eq 'tablet') { if ($opt eq 'hotplug') {
die "skip\n" if ($value =~ /memory/) || ($value !~ /memory/ && $conf->{hotplug} =~ /memory/);
} elsif ($opt eq 'tablet') {
die "skip\n" if !$hotplug_features->{usb}; die "skip\n" if !$hotplug_features->{usb};
if ($value == 1) { if ($value == 1) {
vm_deviceplug($storecfg, $conf, $vmid, $opt); vm_deviceplug($storecfg, $conf, $vmid, $opt);

2
changelog.Debian
View File

@ -1,6 +1,8 @@
qemu-server (3.3-15) unstable; urgency=low qemu-server (3.3-15) unstable; urgency=low
* code cleanup: add foreach_dimm sub * code cleanup: add foreach_dimm sub
* hotplug: memory hotplug option is not hotpluggable
-- Proxmox Support Team <support@proxmox.com> Mon, 09 Feb 2015 07:05:05 +0100 -- Proxmox Support Team <support@proxmox.com> Mon, 09 Feb 2015 07:05:05 +0100