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

white space cleanups

Browse Source
This commit is contained in:
Dietmar Maurer 2014-01-14 10:33:36 +01:00
parent 838776ab65
commit 264e519fab
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
PVE/QemuServer.pm
View File

@ -1748,9 +1748,10 @@ sub write_vm_config {
delete $conf->{smp}; delete $conf->{smp};
} }
if ($conf->{maxcpus} && $conf->{sockets}){ if ($conf->{maxcpus} && $conf->{sockets}) {
delete $conf->{sockets}; delete $conf->{sockets};
} }
my $used_volids = {}; my $used_volids = {};
my $cleanup_config = sub { my $cleanup_config = sub {
@ -2415,9 +2416,9 @@ sub config_to_command {
my $cores = $conf->{cores} || 1; my $cores = $conf->{cores} || 1;
my $maxcpus = $conf->{maxcpus} if $conf->{maxcpus}; my $maxcpus = $conf->{maxcpus} if $conf->{maxcpus};
if($maxcpus){ if ($maxcpus) {
push @$cmd, '-smp', "cpus=$cores,maxcpus=$maxcpus"; push @$cmd, '-smp', "cpus=$cores,maxcpus=$maxcpus";
}else{ } else {
push @$cmd, '-smp', "sockets=$sockets,cores=$cores"; push @$cmd, '-smp', "sockets=$sockets,cores=$cores";
} }
@ -2947,18 +2948,21 @@ sub qemu_cpu_hotplug {
my ($vmid, $conf, $cores) = @_; my ($vmid, $conf, $cores) = @_;
die "new cores config is not defined" if !$cores; die "new cores config is not defined" if !$cores;
die "you can't add more cores than maxcpus" if $conf->{maxcpus} && ($cores > $conf->{maxcpus}); die "you can't add more cores than maxcpus"
if $conf->{maxcpus} && ($cores > $conf->{maxcpus});
return if !check_running($vmid); return if !check_running($vmid);
my $currentcores = $conf->{cores} if $conf->{cores}; my $currentcores = $conf->{cores} if $conf->{cores};
die "current cores is not defined" if !$currentcores; die "current cores is not defined" if !$currentcores;
die "maxcpus is not defined" if !$conf->{maxcpus}; die "maxcpus is not defined" if !$conf->{maxcpus};
raise_param_exc({ 'cores' => "online cpu unplug is not yet possible" }) if($cores < $currentcores); raise_param_exc({ 'cores' => "online cpu unplug is not yet possible" })
if($cores < $currentcores);
my $currentrunningcores = vm_mon_cmd($vmid, "query-cpus"); my $currentrunningcores = vm_mon_cmd($vmid, "query-cpus");
raise_param_exc({ 'cores' => "cores number if running vm is different than configuration" }) if scalar (@{$currentrunningcores}) != $currentcores; raise_param_exc({ 'cores' => "cores number if running vm is different than configuration" })
if scalar (@{$currentrunningcores}) != $currentcores;
for(my $i = $currentcores; $i < $cores; $i++){ for(my $i = $currentcores; $i < $cores; $i++) {
vm_mon_cmd($vmid, "cpu-add", id => int($i)); vm_mon_cmd($vmid, "cpu-add", id => int($i));
} }
} }