" : "' style='display:none'>");
echo "";
echo "";
- echo ""._('Disk devices')." "._('Serial')." "._('Bus')." "._('Capacity')." "._('Allocation')." Boot Order ",_('Disk devices')," ",_('Serial')," ",_('Bus')," ",_('Capacity')," ",_('Allocation')," Boot Order ";
/* Display VM disks */
@@ -172,7 +212,7 @@ foreach ($vms as $vm) {
$bus = $arrValidDiskBuses[$arrDisk['bus']] ?? 'VirtIO';
$boot= $arrDisk["boot order"];
$serial = $arrDisk["serial"];
- if ($boot < 1) $boot="Not set";
+ if ($boot < 1) $boot = _('Not set');
echo "$disk $serial $bus ";
if ($state == 'shutoff') {
echo "";
@@ -196,85 +236,56 @@ foreach ($vms as $vm) {
$capacity = $lv->format_size($arrCD['capacity'], 0);
$allocation = $lv->format_size($arrCD['allocation'], 0);
$disk = $arrCD['file'] ?? $arrCD['partition'] ?? "" ;
- $dev = $arrCD['device'];
- $bus = $arrValidDiskBuses[$arrCD['bus']] ?? 'VirtIO';
- $boot= $arrCD["boot order"] ?? "" ;
- if ($boot < 1) $boot="Not set";
+ $dev = $arrCD['device'];
+ $bus = $arrValidDiskBuses[$arrCD['bus']] ?? 'VirtIO';
+ $boot = $arrCD["boot order"] ?? "" ;
+ if ($boot < 1) $boot = _('Not set');
if ($disk != "" ) {
- $title = _("Eject CD Drive").".";
- $changemedia = "changemedia(\"{$uuid}\",\"{$dev}\",\"{$bus}\", \"--eject\")";
- echo " $disk $bus $capacity $allocation $boot $disk $bus $capacity $allocation $boot $disk $bus $capacity $allocation $boot $disk $bus $capacity $allocation $boot ";
/* Display VM IP Addresses "execute":"guest-network-get-interfaces" --pretty */
- echo ""._('Interfaces')." "._('Type')." "._('IP Address')." "._('Prefix')." ",_('Interfaces')." ",_('Type')." ",_('IP Address')," ",_('Prefix')," ";
- $gastate = getgastate($res);
- if ($gastate == "connected") {
- $ip = $lv->domain_interface_addresses($res, 1);
- if ($ip != false) {
- $duplicates = []; // hide duplicate interface names
- foreach ($ip as $arrIP) {
- $ipname = $arrIP["name"];
- if (preg_match('/^(lo|Loopback)/',$ipname)) continue; // omit loopback interface
- $iphdwadr = $arrIP["hwaddr"] == "" ? _("N/A") : $arrIP["hwaddr"];
- $iplist = $arrIP["addrs"];
- foreach ($iplist as $arraddr) {
- $ipaddrval = $arraddr["addr"];
- if (preg_match('/^f[c-f]/',$ipaddrval)) continue; // omit ipv6 private addresses
- $iptype = $arraddr["type"] ? "ipv6" : "ipv4";
- $ipprefix = $arraddr["prefix"];
- $ipnamemac = "$ipname ($iphdwadr)";
- if (!in_array($ipnamemac,$duplicates)) $duplicates[] = $ipnamemac; else $ipnamemac = "";
- echo "$ipnamemac $iptype $ipaddrval $ipprefix "._('Guest agent not installed')." "._('Guest not running')." ";
/* Display VM Snapshots */
if ($snapshots != null) {
- $j=0 ;
- $steps = array() ;
- foreach($snapshots as $snap) {
+ $j = 0;
+ $steps = array();
+ foreach ($snapshots as $snap) {
if ($snap['parent'] == "" || $snap['parent'] == "Base") $j++;
- $steps[$j] .= $snap['name'].';' ;
- }
- echo ""._('Snapshots')." "._('Date/Time')." "._('Type')." "._('Parent')." "._('Memory')." ";
- foreach($steps as $stepsline)
- {
- $snapshotlist = explode(";",$stepsline) ;
- $tab = " " ;
- foreach($snapshotlist as $snapshotitem) {
- if ($snapshotitem == "") continue ;
- $snapshot = $snapshots[$snapshotitem] ;
- $snapshotstate = _(ucfirst($snapshot["state"])) ;
- $snapshotdesc = $snapshot["desc"] ;
- $snapshotmemory = _(ucfirst($snapshot["memory"]["@attributes"]["snapshot"])) ;
- $snapshotparent = $snapshot["parent"] ? $snapshot["parent"] : "None";
- $snapshotdatetime = my_time($snapshot["creationtime"],"Y-m-d" )."$tab|__ ".$snapshot["name"]."$snapshotdesc $snapshotdatetime $snapshotstate $snapshotparent $snapshotmemory ",_('Snapshots')," ",_('Date/Time')," ",_('Type')," ",_('Parent')," ",_('Memory')," ";
+ foreach ($steps as $stepsline) {
+ $snapshotlist = explode(";",$stepsline);
+ $tab = " ";
+ foreach ($snapshotlist as $snapshotitem) {
+ if ($snapshotitem == "") continue;
+ $snapshot = $snapshots[$snapshotitem] ;
+ $snapshotstate = _(ucfirst($snapshot["state"]));
+ $snapshotdesc = $snapshot["desc"];
+ $snapshotmemory = _(ucfirst($snapshot["memory"]["@attributes"]["snapshot"]));
+ $snapshotparent = $snapshot["parent"] ? $snapshot["parent"] : "None";
+ $snapshotdatetime = my_time($snapshot["creationtime"],"Y-m-d" )."$tab|__ ",$snapshot["name"],"$snapshotdesc $snapshotdatetime $snapshotstate $snapshotparent $snapshotmemory ";
- }
+ }
}
echo "
";
}
-
echo "\0".implode($kvm);
?>
diff --git a/emhttp/plugins/dynamix.vm.manager/include/VMManager.php b/emhttp/plugins/dynamix.vm.manager/include/VMManager.php
index a56278de2..435e537f2 100644
--- a/emhttp/plugins/dynamix.vm.manager/include/VMManager.php
+++ b/emhttp/plugins/dynamix.vm.manager/include/VMManager.php
@@ -1,7 +1,7 @@
">
- _(CPU Mode)_:
+ _(CPU)_ _(Mode)_:
-
+
_('Host Passthrough').' (' . $strCPUModel . ')', 'custom' => _('Emulated').' ('._('QEMU64').')'], $arrConfig['domain']['cpumode']);?>
+ >_(Migratable)_:
+
+ class="narrow" title="_(define if migratable)_">
+
+
@@ -333,6 +353,10 @@
Emulated
+ Migratable
@@ -380,10 +404,8 @@
}
?>
-
-
- _(Max)_ _(Memory)_:
-
+
+ _(Max)_ _(Memory)_:
-