mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-04-30 06:49:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

VMs: keep custom hostdev definitions

Browse Source
This commit is contained in:
bergware
2018-08-15 16:19:52 +02:00
parent 500cad1b90
commit 56dbeb2717
4 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix.vm.manager/include/libvirt_helpers.php
+12 -10
View File
@@ -1080,21 +1080,22 @@
}
function array_update_recursive(&$old, &$new) {
$hostdev = $new['devices']['hostdev'];
$hostold = $old['devices']['hostdev'];
$hostold = $old['devices']['hostdev']; // existing devices including custom settings
$hostnew = $new['devices']['hostdev']; // GUI generated devices
// update USB & PCI host devices
foreach ($hostdev as $key => $device) {
foreach ($hostnew as $key => $device) {
$auto = $device['tag'];
$vendor = $device['source']['vendor']['@attributes']['id'];
$product = $device['source']['product']['@attributes']['id'];
$remove = false;
list($product,$remove) = explode('#',$device['source']['product']['@attributes']['id']);
$pci = $device['source']['address']['@attributes'];
// check if device already exists
if ($remove) unset($new['devices']['hostdev'][$key]);
foreach ($hostold as $k => $d) {
$v = $d['source']['vendor']['@attributes']['id'];
$p = $d['source']['product']['@attributes']['id'];
$p2 = $d['source']['address']['@attributes'];
// merge old and new settings
if ($v && $p && $v==$vendor && $p==$product) $hostdev[$key] = $d;
if ($p2['bus'] && $p2['slot'] && $p2['bus']==$pci['bus'] && $p2['slot']==$pci['slot']) $hostdev[$key] = $d;
if ($v && $p && $v==$vendor && $p==$product && $remove) unset($old['devices']['hostdev'][$k]);
if ($p2['bus'] && $p2['slot'] && $p2['function'] && $p2['bus']==$pci['bus'] && $p2['slot']==$pci['slot'] && $p2['function']==$pci['function'] && $remove) unset($old['devices']['hostdev'][$k]);
}
}
// settings not in the GUI, but maybe customized
@@ -1102,8 +1103,9 @@
$new['clock'] = $old['clock'];
$new['features'] = $old['features'];
// update parent arrays
if ($hostdev) $new['devices']['hostdev'] = $hostdev;
unset($old['cputune']['vcpupin'], $old['devices']['hostdev']);
if (!$old['devices']['hostdev']) unset($old['devices']['hostdev']);
if (!$new['devices']['hostdev']) unset($new['devices']['hostdev']);
unset($old['cputune']['vcpupin']);
// set namespace
$new['metadata']['vmtemplate']['@attributes']['xmlns'] = 'unraid';
}