Proxmox/qemu-server
5
0
Fork 0
mirror of git://git.proxmox.com/git/qemu-server.git synced 2025-03-10 12:58:25 +03:00
Code Releases Activity

add vcpus option

Browse Source 
vcpus = current allocate vpus to virtual machine

maxcpus is now compute from $sockets*cores
vcpus = maxcpus if not defined

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier 2015-01-09 16:30:35 +01:00 committed by Dietmar Maurer
parent 70b048219e
commit de9d1e5574
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PVE/API2/Qemu.pm
View File

@ -226,7 +226,7 @@ my $check_vm_modify_config_perm = sub {
next if PVE::QemuServer::valid_drivename($opt);
if ($opt eq 'sockets' || $opt eq 'cores' ||
$opt eq 'cpu' || $opt eq 'smp' ||
$opt eq 'cpu' || $opt eq 'smp' || $opt eq 'vcpus' ||
$opt eq 'cpulimit' || $opt eq 'cpuunits') {
$rpcenv->check_vm_perm($authuser, $vmid, $pool, ['VM.Config.CPU']);
} elsif ($opt eq 'boot' || $opt eq 'bootdisk') {

28
PVE/QemuServer.pm
View File

@ -312,12 +312,12 @@ EODESC
description => "Enable/disable Numa.",
default => 0,
},
maxcpus => {
vcpus => {
optional => 1,
type => 'integer',
description => "Maximum cpus for hotplug.",
description => "Number of hotplugged vcpus.",
minimum => 1,
default => 1,
default => 0,
},
acpi => {
optional => 1,
@ -2029,10 +2029,6 @@ sub write_vm_config {
delete $conf->{smp};
}
if ($conf->{maxcpus} && $conf->{sockets}) {
delete $conf->{sockets};
}
my $used_volids = {};
my $cleanup_config = sub {
@ -2759,19 +2755,17 @@ sub config_to_command {
$sockets = $conf->{sockets} if $conf->{sockets};
my $cores = $conf->{cores} || 1;
my $maxcpus = $conf->{maxcpus} if $conf->{maxcpus};
my $total_cores = $sockets * $cores;
my $allowed_cores = $cpuinfo->{cpus};
my $maxcpus = $sockets * $cores;
die "MAX $allowed_cores cores allowed per VM on this node\n"
if ($allowed_cores < $total_cores);
my $vcpus = $conf->{vcpus} ? $conf->{vcpus} : $maxcpus;
if ($maxcpus) {
push @$cmd, '-smp', "cpus=$cores,maxcpus=$maxcpus";
} else {
push @$cmd, '-smp', "sockets=$sockets,cores=$cores";
}
my $allowed_vcpus = $cpuinfo->{cpus};
die "MAX $maxcpus vcpus allowed per VM on this node\n"
if ($allowed_vcpus < $maxcpus);
push @$cmd, '-smp', "$vcpus,sockets=$sockets,cores=$cores,maxcpus=$maxcpus";
push @$cmd, '-nodefaults';