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

enable vcpus hotplug

Browse Source 
Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier 2015-01-09 16:30:36 +01:00 committed by Dietmar Maurer
parent de9d1e5574
commit 8edc9c08aa
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
PVE/QemuServer.pm
View File

@ -3410,27 +3410,28 @@ sub qemu_netdevdel {
} }
sub qemu_cpu_hotplug { sub qemu_cpu_hotplug {
my ($vmid, $conf, $cores) = @_; my ($vmid, $conf, $vcpus) = @_;
my $sockets = $conf->{sockets} || 1; my $sockets = 1;
die "cpu hotplug only works with one socket\n" $sockets = $conf->{smp} if $conf->{smp}; # old style - no longer iused
if $sockets > 1; $sockets = $conf->{sockets} if $conf->{sockets};
my $cores = $conf->{cores} || 1;
my $maxcpus = $sockets * $cores;
die "maxcpus is not defined\n" $vcpus = $maxcpus if !$vcpus;
if !$conf->{maxcpus};
die "you can't add more cores than maxcpus\n" die "you can't add more vcpus than maxcpus\n"
if $cores > $conf->{maxcpus}; if $vcpus > $maxcpus;
my $currentcores = $conf->{cores} || 1; my $currentvcpus = $conf->{vcpus} || $maxcpus;
die "online cpu unplug is not yet possible\n" die "online cpu unplug is not yet possible\n"
if $cores < $currentcores; if $vcpus < $currentvcpus;
my $currentrunningcores = vm_mon_cmd($vmid, "query-cpus"); my $currentrunningvcpus = vm_mon_cmd($vmid, "query-cpus");
die "cores number if running vm is different than configuration\n" die "vcpus in running vm is different than configuration\n"
if scalar(@{$currentrunningcores}) != $currentcores; if scalar(@{$currentrunningvcpus}) != $currentvcpus;
for (my $i = $currentcores; $i < $cores; $i++) { for (my $i = $currentvcpus; $i < $vcpus; $i++) {
vm_mon_cmd($vmid, "cpu-add", id => int($i)); vm_mon_cmd($vmid, "cpu-add", id => int($i));
} }
} }
@ -3667,9 +3668,9 @@ sub vmconfig_hotplug_pending {
} else { } else {
vm_deviceunplug($vmid, $conf, $opt); vm_deviceunplug($vmid, $conf, $opt);
} }
} elsif ($opt eq 'cores') { } elsif ($opt eq 'vcpus') {
die "skip\n" if !$hotplug; die "skip\n" if !$hotplug;
qemu_cpu_hotplug($vmid, $conf, 1); qemu_cpu_hotplug($vmid, $conf, undef);
} 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}; die "skip\n" if !defined($conf->{balloon}) || $conf->{balloon};
@ -3708,7 +3709,7 @@ sub vmconfig_hotplug_pending {
} elsif ($value == 0) { } elsif ($value == 0) {
vm_deviceunplug($vmid, $conf, $opt); vm_deviceunplug($vmid, $conf, $opt);
} }
} elsif ($opt eq 'cores') { } elsif ($opt eq 'vcpus') {
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') {