mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-02-28 21:29:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use '/etc/rc.d/rc.libvirt test' to check for VM capability (gets rid of nagging syslog message - sorry

Browse Source 
the OCD's kicking in again).
This commit is contained in:
Tom Mortensen
2016-07-01 14:34:09 -07:00
parent cf4ace30f0
commit ddef177914
2 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/dynamix.vm.manager/VMSettings.page
View File

@@ -22,17 +22,10 @@ require_once('/usr/local/emhttp/plugins/dynamix.vm.manager/classes/libvirt_helpe
// Check for Intel VT-x (vmx) or AMD-V (svm) cpu virtualzation support
// If either kvm_intel or kvm_amd are loaded then Intel VT-x (vmx) or AMD-V (svm) cpu virtualzation support was found
$strLoadedModules = shell_exec("lsmod | grep '^kvm_\(amd\|intel\)'");
$strLoadedModules = shell_exec("/etc/rc.d/rc.libvirt test");
if (empty($strLoadedModules)) {
// Attempt to load either of the kvm modules to see if virtualzation hw is supported
exec('modprobe -a kvm_intel kvm_amd 2>/dev/null');
$strLoadedModules = shell_exec("lsmod | grep '^kvm_\(amd\|intel\)'");
if (!empty($strLoadedModules)) {
exec('modprobe -r kvm_intel kvm_amd 2>/dev/null');
} else {
?><p class="notice">Your hardware does not have Intel VT-x or AMD-V capability. This is required to create VMs in KVM. <a href="http://lime-technology.com/wiki/index.php/UnRAID_Manual_6#Hardware-Assisted_Virtualization_.28HVM.29" target="_blank">Click here to see the unRAID Wiki for more information</a></p><?php
exit;
}
?><p class="notice">Your hardware does not have Intel VT-x or AMD-V capability. This is required to $
exit;
}
@@ -123,7 +116,7 @@ if ($boolACSEnabled != $boolACSInSyslinux) {
</dd>
</dl>
<blockquote class="inline_help">
<p>Stopping the VM Manager will first attempt to shutdown all running VMs. After 40 seconds, any remaining VM instances will be terminated.</p>
<p>Stopping the VM Manager will first attempt to shutdown all running VMs. After 60 seconds, any remaining VM instances will be terminated.</p>
</blockquote>
<div class="advanced">

10
plugins/dynamix/include/SystemInformation.php
View File

@@ -70,15 +70,7 @@ if (strpos($cpumodel,'@')===false) {
<?
// Check for Intel VT-x (vmx) or AMD-V (svm) cpu virtualzation support
// If either kvm_intel or kvm_amd are loaded then Intel VT-x (vmx) or AMD-V (svm) cpu virtualzation support was found
$strLoadedModules = shell_exec("lsmod | grep '^kvm_\(amd\|intel\)'");
if (empty($strLoadedModules)) {
// Attempt to load either of the kvm modules to see if virtualzation hw is supported
exec('modprobe -a kvm_intel kvm_amd 2>/dev/null');
$strLoadedModules = shell_exec("lsmod | grep '^kvm_\(amd\|intel\)'");
if (!empty($strLoadedModules)) {
exec('modprobe -r kvm_intel kvm_amd 2>/dev/null');
}
}
$strLoadedModules = shell_exec("/etc/rc.d/rc.libvirt test");
// Check for Intel VT-x (vmx) or AMD-V (svm) cpu virtualzation support
$strCPUInfo = file_get_contents('/proc/cpuinfo');