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

Merge pull request #1160 from SimonFair/USB-StartupPolicy-and-missing-devices-

Browse Source 
Add Missing USB support
This commit is contained in:
tom mortensen
2022-09-19 11:13:40 -07:00
committed by GitHub
parent e4e42f9518 c7f0e27847
commit 017488035a
5 changed files with 88 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/dynamix.vm.manager/include/libvirt.php
View File

@@ -262,6 +262,7 @@
$nics = $config['nic'];
$disks = $config['disk'];
$usb = $config['usb'];
$usbopt = $config['usbopt'];
$shares = $config['shares'];
$gpus = $config['gpu'];
$pcis = $config['pci'];
@@ -447,8 +448,12 @@
if (!empty($usb)) {
foreach($usb as $i => $v){
$usbx = explode(':', $v);
$startupPolicy = '' ;
if (isset($usbopt[$i])) {
if (strpos($usbopt[$i], "#remove") == false) $startupPolicy = 'startupPolicy="optional"' ; else $startupPolicy = '' ;
}
$usbstr .= "<hostdev mode='subsystem' type='usb'>
<source>
<source $startupPolicy>
<vendor id='0x".$usbx[0]."'/>
<product id='0x".$usbx[1]."'/>
</source>

41
plugins/dynamix.vm.manager/include/libvirt_helpers.php
View File

@@ -1179,4 +1179,45 @@
// set namespace
$new['metadata']['vmtemplate']['@attributes']['xmlns'] = 'unraid';
}
function getVMUSBs($strXML){
$arrValidUSBDevices = getValidUSBDevices() ;
foreach($arrValidUSBDevices as $key => $data) {
$array[$key] = [
'id' => $data['id'],
'name' => $data["name"],
'checked' => '',
'startupPolicy' => ''
];
}
if ($strXML !="") {
$VMxml = new SimpleXMLElement($strXML);
$VMUSB=$VMxml->xpath('//devices/hostdev[@type="usb"]/source') ;
foreach($VMUSB as $USB){
$vendor=$USB->vendor->attributes()->id ;
$product=$USB->product->attributes()->id ;
$startupPolicy=$USB->attributes()->startupPolicy ;
$id = str_replace('0x', '', $vendor . ':' . $product) ;
$found = false ;
foreach($arrValidUSBDevices as $key => $data) {
if ($data['id'] == $id) {
$array[$key]['checked'] = "checked" ;
$array[$key]['startupPolicy'] = $startupPolicy ;
$found = true ;
break ;
}
}
if (!$found) {
$array[] = [
'id' => $id,
'name' => _("USB device is missing"),
'checked' => 'checked',
'startupPolicy' => $startupPolicy
];
}
}
}
return $array ;
}
?>

20
plugins/dynamix.vm.manager/templates/Custom.form.php
View File

@@ -244,12 +244,14 @@
$strXML = $lv->domain_get_xml($dom);
$boolNew = false;
$arrConfig = array_replace_recursive($arrConfigDefaults, domain_to_config($uuid));
$arrVMUSBs = getVMUSBs($strXML) ;
} else {
// edit new VM
$boolRunning = false;
$strXML = '';
$boolNew = true;
$arrConfig = $arrConfigDefaults;
$arrVMUSBs = getVMUSBs($strXML) ;
}
// Add any custom metadata field defaults (e.g. os)
if (!$arrConfig['template']['os']) {
@@ -1112,15 +1114,18 @@
</script>
<table>
<tr><td></td>
<td>_(Select)_&nbsp&nbsp_(Optional)_</td></tr></div>
<tr>
<td>_(USB Devices)_:</td>
<td>
<div class="textarea" style="width: 540px">
<div class="textarea" style="width: 640px">
<?
if (!empty($arrValidUSBDevices)) {
foreach($arrValidUSBDevices as $i => $arrDev) {
if (!empty($arrVMUSBs)) {
foreach($arrVMUSBs as $i => $arrDev) {
?>
<label for="usb<?=$i?>"><input type="checkbox" name="usb[]" id="usb<?=$i?>" value="<?=htmlspecialchars($arrDev['id'])?>" <?if (count(array_filter($arrConfig['usb'], function($arr) use ($arrDev) { return ($arr['id'] == $arrDev['id']); }))) echo 'checked="checked"';?>/> <?=htmlspecialchars($arrDev['name'])?> (<?=htmlspecialchars($arrDev['id'])?>)</label><br/>
<label for="usb<?=$i?>">&nbsp&nbsp&nbsp&nbsp<input type="checkbox" name="usb[]" id="usb<?=$i?>" value="<?=htmlspecialchars($arrDev['id'])?>" <?if (count(array_filter($arrConfig['usb'], function($arr) use ($arrDev) { return ($arr['id'] == $arrDev['id']); }))) echo 'checked="checked"';?>
/> &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp <input type="checkbox" name="usbopt[]" id="usbopt<?=$i?>" value="<?=htmlspecialchars($arrDev['id'])?>" <?if ($arrDev["startupPolicy"] =="optional") echo 'checked="checked"';?>/>&nbsp&nbsp&nbsp <?=htmlspecialchars($arrDev['name'])?> (<?=htmlspecialchars($arrDev['id'])?>)</label><br/>
<?
}
} else {
@@ -1133,13 +1138,14 @@
</table>
<blockquote class="inline_help">
<p>If you wish to assign any USB devices to your guest, you can select them from this list.</p>
<p>Select optional if you want device to be ignored when VM starts if not present.</p>
</blockquote>
<table>
<tr>
<td>_(Other PCI Devices)_:</td>
<td>
<div class="textarea" style="width: 540px">
<div class="textarea" style="width: 640px">
<?
$intAvailableOtherPCIDevices = 0;
@@ -1504,7 +1510,7 @@ $(function() {
<?if (!$boolNew):?>
// signal devices to be added or removed
form.find('input[name="usb[]"],input[name="pci[]"]').each(function(){
form.find('input[name="usb[]"],input[name="pci[]"],input[name="usbopt[]"]').each(function(){
if (!$(this).prop('checked')) $(this).prop('checked',true).val($(this).val()+'#remove');
});
// remove unused graphic cards
@@ -1531,7 +1537,7 @@ $(function() {
var postdata = form.find('input,select').serialize().replace(/'/g,"%27");
<?if (!$boolNew):?>
// keep checkbox visually unchecked
form.find('input[name="usb[]"],input[name="pci[]"]').each(function(){
form.find('input[name="usb[]"],input[name="usbopt[]"],input[name="pci[]"]').each(function(){
if ($(this).val().indexOf('#remove')>0) $(this).prop('checked',false);
});
<?endif?>

21
plugins/dynamix.vm.manager/templates/LibreELEC.form.php
View File

@@ -398,12 +398,14 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
$strXML = $lv->domain_get_xml($dom);
$boolNew = false;
$arrConfig = array_replace_recursive($arrConfigDefaults, domain_to_config($uuid));
$arrVMUSBs = getVMUSBs($strXML) ;
} else {
// edit new VM
$boolRunning = false;
$strXML = '';
$boolNew = true;
$arrConfig = $arrConfigDefaults;
$arrVMUSBs = getVMUSBs($strXML) ;
}
if (array_key_exists($arrConfig['template']['libreelec'], $arrLibreELECVersions)) {
@@ -920,15 +922,19 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
</script>
<table>
<tr><td></td>
<td>_(Select)_&nbsp&nbsp_(Optional)_</td></tr></div>
<tr>
<tr>
<td>_(USB Devices)_:</td>
<td>
<div class="textarea" style="width:540px">
<div class="textarea" style="width:640px">
<?
if (!empty($arrValidUSBDevices)) {
foreach($arrValidUSBDevices as $i => $arrDev) {
if (!empty($arrVMUSBs)) {
foreach($arrVMUSBs as $i => $arrDev) {
?>
<label for="usb<?=$i?>"><input type="checkbox" name="usb[]" id="usb<?=$i?>" value="<?=htmlspecialchars($arrDev['id'])?>" <?if (count(array_filter($arrConfig['usb'], function($arr) use ($arrDev) { return ($arr['id'] == $arrDev['id']); }))) echo 'checked="checked"';?>/> <?=htmlspecialchars($arrDev['name'])?> (<?=htmlspecialchars($arrDev['id'])?>)</label><br/>
<label for="usb<?=$i?>">&nbsp&nbsp&nbsp&nbsp<input type="checkbox" name="usb[]" id="usb<?=$i?>" value="<?=htmlspecialchars($arrDev['id'])?>" <?if (count(array_filter($arrConfig['usb'], function($arr) use ($arrDev) { return ($arr['id'] == $arrDev['id']); }))) echo 'checked="checked"';?>
/> &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp <input type="checkbox" name="usbopt[]" id="usbopt<?=$i?>" value="<?=htmlspecialchars($arrDev['id'])?>" <?if ($arrDev["startupPolicy"] =="optional") echo 'checked="checked"';?>/>&nbsp&nbsp&nbsp <?=htmlspecialchars($arrDev['name'])?> (<?=htmlspecialchars($arrDev['id'])?>)</label><br/>
<?
}
} else {
@@ -941,13 +947,14 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
</table>
<blockquote class="inline_help">
<p>If you wish to assign any USB devices to your guest, you can select them from this list.</p>
<p>Select optional if you want device to be ignored when VM starts if not present.</p>
</blockquote>
<table>
<tr>
<td>_(Other PCI Devices)_:</td>
<td>
<div class="textarea" style="width:540px">
<div class="textarea" style="width:640px">
<?
$intAvailableOtherPCIDevices = 0;
@@ -1161,7 +1168,7 @@ $(function() {
<?if (!$boolNew):?>
// signal devices to be added or removed
form.find('input[name="usb[]"],input[name="pci[]"]').each(function(){
form.find('input[name="usb[]"],input[name="pci[]"],input[name="usbopt[]"]').each(function(){
if (!$(this).prop('checked')) $(this).prop('checked',true).val($(this).val()+'#remove');
});
// remove unused graphic cards
@@ -1188,7 +1195,7 @@ $(function() {
var postdata = form.find('input,select').serialize().replace(/'/g,"%27");
<?if (!$boolNew):?>
// keep checkbox visually unchecked
form.find('input[name="usb[]"],input[name="pci[]"]').each(function(){
form.find('input[name="usb[]"],input[name="pci[]"],input[name="usbopt[]"]').each(function(){
if ($(this).val().indexOf('#remove')>0) $(this).prop('checked',false);
});
<?endif?>

21
plugins/dynamix.vm.manager/templates/OpenELEC.form.php
View File

@@ -398,12 +398,14 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
$strXML = $lv->domain_get_xml($dom);
$boolNew = false;
$arrConfig = array_replace_recursive($arrConfigDefaults, domain_to_config($uuid));
$arrVMUSBs = getVMUSBs($strXML) ;
} else {
// edit new VM
$boolRunning = false;
$strXML = '';
$boolNew = true;
$arrConfig = $arrConfigDefaults;
$arrVMUSBs = getVMUSBs($strXML) ;
}
if (array_key_exists($arrConfig['template']['openelec'], $arrLibreELECVersions)) {
@@ -920,15 +922,19 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
</script>
<table>
<tr><td></td>
<td>_(Select)_&nbsp&nbsp_(Optional)_</td></tr></div>
<tr>
<tr>
<td>_(USB Devices)_:</td>
<td>
<div class="textarea" style="width:540px">
<div class="textarea" style="width:640px">
<?
if (!empty($arrValidUSBDevices)) {
foreach($arrValidUSBDevices as $i => $arrDev) {
if (!empty($arrVMUSBs)) {
foreach($arrVMUSBs as $i => $arrDev) {
?>
<label for="usb<?=$i?>"><input type="checkbox" name="usb[]" id="usb<?=$i?>" value="<?=htmlspecialchars($arrDev['id'])?>" <?if (count(array_filter($arrConfig['usb'], function($arr) use ($arrDev) { return ($arr['id'] == $arrDev['id']); }))) echo 'checked="checked"';?>/> <?=htmlspecialchars($arrDev['name'])?> (<?=htmlspecialchars($arrDev['id'])?>)</label><br/>
<label for="usb<?=$i?>">&nbsp&nbsp&nbsp&nbsp<input type="checkbox" name="usb[]" id="usb<?=$i?>" value="<?=htmlspecialchars($arrDev['id'])?>" <?if (count(array_filter($arrConfig['usb'], function($arr) use ($arrDev) { return ($arr['id'] == $arrDev['id']); }))) echo 'checked="checked"';?>
/> &nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp <input type="checkbox" name="usbopt[]" id="usbopt<?=$i?>" value="<?=htmlspecialchars($arrDev['id'])?>" <?if ($arrDev["startupPolicy"] =="optional") echo 'checked="checked"';?>/>&nbsp&nbsp&nbsp <?=htmlspecialchars($arrDev['name'])?> (<?=htmlspecialchars($arrDev['id'])?>)</label><br/>
<?
}
} else {
@@ -941,13 +947,14 @@ $hdrXML = "<?xml version='1.0' encoding='UTF-8'?>\n"; // XML encoding declaratio
</table>
<blockquote class="inline_help">
<p>If you wish to assign any USB devices to your guest, you can select them from this list.</p>
<p>Select optional if you want device to be ignored when VM starts if not present.</p>
</blockquote>
<table>
<tr>
<td>_(Other PCI Devices)_:</td>
<td>
<div class="textarea" style="width:540px">
<div class="textarea" style="width:640px">
<?
$intAvailableOtherPCIDevices = 0;
@@ -1161,7 +1168,7 @@ $(function() {
<?if (!$boolNew):?>
// signal devices to be added or removed
form.find('input[name="usb[]"],input[name="pci[]"]').each(function(){
form.find('input[name="usb[]"],input[name="pci[]"],input[name="usbopt[]"]').each(function(){
if (!$(this).prop('checked')) $(this).prop('checked',true).val($(this).val()+'#remove');
});
// remove unused graphic cards
@@ -1188,7 +1195,7 @@ $(function() {
var postdata = form.find('input,select').serialize().replace(/'/g,"%27");
<?if (!$boolNew):?>
// keep checkbox visually unchecked
form.find('input[name="usb[]"],input[name="pci[]"]').each(function(){
form.find('input[name="usb[]"],input[name="pci[]"],input[name="usbopt[]"]').each(function(){
if ($(this).val().indexOf('#remove')>0) $(this).prop('checked',false);
});
<?endif?>