mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-01-05 09:10:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

Allow non pinned vcpus for VMs

Browse Source
This commit is contained in:
SimonFair
2024-11-10 18:59:01 +00:00
parent 092c6e0445
commit a915a687d4
8 changed files with 119 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
emhttp/plugins/dynamix/include/UpdateTwo.php
View File

@@ -40,7 +40,8 @@ case 'vm':
/* Read new CPU assignments and delete the temporary file */
$cpuset = explode(',', file_get_contents($file));
unlink($file);
$vcpus = count($cpuset);
$nopin = false;
if ($cpuset[0] >= 0) $vcpus = count($cpuset); else {$vcpus = -1 * $cpuset[0]; $nopin = true; }
/* Initial cores/threads assignment */
$cores = $vcpus;
@@ -68,22 +69,26 @@ case 'vm':
/* Preserve existing emulatorpin attributes */
$pin = [];
foreach ($xml->cputune->emulatorpin->attributes() as $key => $value) {
$pin[$key] = (string) $value;
if (isset($xml->cputune)) {
foreach ($xml->cputune->emulatorpin->attributes() as $key => $value) {
$pin[$key] = (string) $value;
}
}
unset($xml->cputune);
/* Add new cputune configuration */
$xml->addChild('cputune');
for ($i = 0; $i < $vcpus; $i++) {
$vcpu = $xml->cputune->addChild('vcpupin');
$vcpu['vcpu'] = $i;
$vcpu['cpuset'] = _var($cpuset, $i);
}
if ($pin) {
$attr = $xml->cputune->addChild('emulatorpin');
foreach ($pin as $key => $value) {
$attr[$key] = $value;
if (!$nopin) {
$xml->addChild('cputune');
for ($i = 0; $i < $vcpus; $i++) {
$vcpu = $xml->cputune->addChild('vcpupin');
$vcpu['vcpu'] = $i;
$vcpu['cpuset'] = _var($cpuset, $i);
}
if ($pin) {
$attr = $xml->cputune->addChild('emulatorpin');
foreach ($pin as $key => $value) {
$attr[$key] = $value;
}
}
}
@@ -109,7 +114,7 @@ case 'vm':
/* Backup NVRAM, undefine the domain, and restore NVRAM */
$lv->nvram_backup($uuid);
$lv->domain_undefine($dom);
#$lv->domain_undefine($dom);
$lv->nvram_restore($uuid);
/* Define the domain with the updated XML configuration */