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

code cleanup

Browse Source
This commit is contained in:
Dietmar Maurer 2015-01-07 10:02:32 +01:00
parent 9c2f70692e
commit 81d95ae1a8
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
PVE/QemuServer.pm
View File

@ -3604,6 +3604,14 @@ sub set_migration_caps {
vm_mon_cmd_nocheck($vmid, "migrate-set-capabilities", capabilities => $cap_ref); vm_mon_cmd_nocheck($vmid, "migrate-set-capabilities", capabilities => $cap_ref);
} }
my $fast_plug_option = {
'name' => 1,
'hotplug' => 1,
'onboot' => 1,
'shares' => 1,
'startup' => 1,
};
# hotplug changes in [PENDING] # hotplug changes in [PENDING]
# $selection hash can be used to only apply specified options, for # $selection hash can be used to only apply specified options, for
# example: { cores => 1 } (only apply changed 'cores') # example: { cores => 1 } (only apply changed 'cores')
@ -3624,7 +3632,7 @@ sub vmconfig_hotplug_pending {
my $changes = 0; my $changes = 0;
foreach my $opt (keys %{$conf->{pending}}) { # add/change foreach my $opt (keys %{$conf->{pending}}) { # add/change
if ($opt eq 'name' || $opt eq 'hotplug' || $opt eq 'onboot' || $opt eq 'shares') { if ($fast_plug_option->{$opt}) {
$conf->{$opt} = $conf->{pending}->{$opt}; $conf->{$opt} = $conf->{pending}->{$opt};
delete $conf->{pending}->{$opt}; delete $conf->{pending}->{$opt};
$changes = 1; $changes = 1;
@ -3654,8 +3662,9 @@ sub vmconfig_hotplug_pending {
qemu_cpu_hotplug($vmid, $conf, 1); qemu_cpu_hotplug($vmid, $conf, 1);
} elsif ($opt eq 'balloon') { } elsif ($opt eq 'balloon') {
# enable balloon device is not hotpluggable # enable balloon device is not hotpluggable
die "skip\n" if ((defined($conf->{balloon})) && ($conf->{balloon} == 0)); die "skip\n" if !defined($conf->{balloon}) || $conf->{balloon};
} elsif ($opt eq 'shares') { } elsif ($fast_plug_option->{$opt}) {
# do nothing
} elsif ($opt =~ m/^net(\d+)$/) { } elsif ($opt =~ m/^net(\d+)$/) {
die "skip\n" if !$hotplug; die "skip\n" if !$hotplug;
vm_deviceunplug($vmid, $conf, $opt); vm_deviceunplug($vmid, $conf, $opt);
@ -3693,10 +3702,11 @@ sub vmconfig_hotplug_pending {
die "skip\n" if !$hotplug; die "skip\n" if !$hotplug;
qemu_cpu_hotplug($vmid, $conf, $value); qemu_cpu_hotplug($vmid, $conf, $value);
} elsif ($opt eq 'balloon') { } elsif ($opt eq 'balloon') {
# disable balloning device is not hotpluggable # enable/disable balloning device is not hotpluggable
die "skip\n" if ((defined($conf->{pending}->{balloon})) && ($conf->{pending}->{balloon} == 0)); my $old_balloon_enabled = !defined($conf->{balloon}) || $conf->{balloon};
# enable balloning device is not hotpluggable my $new_balloon_enabled = !defined($conf->{pending}->{balloon}) || $conf->{pending}->{balloon};
die "skip\n" if ((defined($conf->{balloon})) && ($conf->{balloon} == 0)); die "skip\n" if $old_balloon_enabled != $new_balloon_enabled;
# allow manual ballooning if shares is set to zero # allow manual ballooning if shares is set to zero
if (!(defined($conf->{shares}) && ($conf->{shares} == 0))) { if (!(defined($conf->{shares}) && ($conf->{shares} == 0))) {
my $balloon = $conf->{pending}->{balloon} || $conf->{memory} || $defaults->{memory}; my $balloon = $conf->{pending}->{balloon} || $conf->{memory} || $defaults->{memory};