[pve-devel] [PATCH 1/3] add maxcpus config

[Alexandre Derumier]

Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
---
 PVE/QemuServer.pm |   18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index ffad5f2..db2535c 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -300,6 +300,13 @@ EODESC
 	minimum => 1,
 	default => 1,
     },
+    maxcpus => {
+	optional => 1,
+	type => 'integer',
+	description => "Maximum cpus for hotplug.",
+	minimum => 1,
+	default => 1,
+    },
     acpi => {
 	optional => 1,
 	type => 'boolean',
@@ -1741,6 +1748,9 @@ sub write_vm_config {
 	delete $conf->{smp};
     }
 
+    if ($conf->{maxcpus} && $conf->{sockets}){
+	delete $conf->{sockets};
+    }
     my $used_volids = {};
 
     my $cleanup_config = sub {
@@ -2403,7 +2413,13 @@ sub config_to_command {
     $sockets = $conf->{sockets} if  $conf->{sockets};
 
     my $cores = $conf->{cores} || 1;
-    push @$cmd, '-smp', "sockets=$sockets,cores=$cores";
+    my $maxcpus = $conf->{maxcpus} if $conf->{maxcpus};
+
+    if($maxcpus){
+	push @$cmd, '-smp', "cpus=$cores,maxcpus=$maxcpus";
+    }else{
+	push @$cmd, '-smp', "sockets=$sockets,cores=$cores";
+    }
 
     push @$cmd, '-nodefaults';
 
-- 
1.7.10.4