Updates for libvirt image removal and use directory

emhttp/languages/en_US/helptext.txt

@@ -1711,7 +1711,11 @@ Stop VMs from Autostarting\Starting when VM Manager starts or open is run from t
 :end
 
 :vms_libvirt_volume_help:
-This is the libvirt volume.
+This is the libvirt volume/directory.
+:end
+
+:vms_libvirt_secondary_volume_help:
+This is a location for storing previous versions of XML and NVRAM when changes are made.
 :end
 
 :vms_libvirt_vdisk_size_help:
@@ -1720,7 +1724,11 @@ To resize an existing image file, specify the new size here. Next time the Libvi
 :end
 
 :vms_libvirt_location_help:
-You must specify an image file for Libvirt. The system will automatically create this file when the Libvirt service is first started.
+You must specify an image file/directory for Libvirt. The system will automatically create this file/directory when the Libvirt service is first started.
+:end
+
+:vms_libvirt_secondary_location_help:
+This is a directory for storing previous versions of xml and nvram at change. Does not need to be specified.
 :end
 
 :vms_libvirt_storage_help:

emhttp/plugins/dynamix.vm.manager/VMSettings.page

@@ -123,7 +123,7 @@ $libvirt_log       = file_exists("/var/log/libvirt/libvirtd.log");
 <input type="hidden" name="#file" value="<?=htmlspecialchars($domain_cfgfile)?>">
 <input type="hidden" name="#command" value="/plugins/dynamix/scripts/emcmd">
 <input type="hidden" name="#arg[1]" value="cmdStatus=Apply">
-
+<input type="hidden" id="OLD_IMAGE_FILE" name="OLD_IMAGE_FILE" value="<?=htmlspecialchars($domain_cfg['IMAGE_FILE']);?>">
 _(Enable VMs)_:
 : <select id="SERVICE" name="SERVICE">
   <?= mk_option($libvirt_service, 'disable', _('No'))?>
@@ -150,6 +150,7 @@ _(Disable Autostart/Start option for VMs)_:
 <?if ($libvirt_up):?>
 <?$libvirt_info = libvirt_version('libvirt')?>
 <?$qemu_info = $lv->get_connect_information()?>
+
 _(Libvirt version)_:
 : <?=$libvirt_info['libvirt.major'].'.'.$libvirt_info['libvirt.minor'].'.'.$libvirt_info['libvirt.release']?>
 
@@ -161,14 +162,15 @@ _(Libvirt storage location)_:
 
 :vms_libvirt_volume_help:
 
-<?else: /* Libvirt is stopped */ ?>
-_(Libvirt vdisk size)_ (_(GB)_):
+<?else : /* Libvirt is stopped */ ?>
+
+ _(Libvirt vdisk size)_ (_(GB)_):
 : <input type="number" id="IMAGE_SIZE" name="IMAGE_SIZE" min="1" value="<?=htmlspecialchars($domain_cfg['IMAGE_SIZE']);?>" required="required" /><span id="SIZE_ERROR" class="errortext"></span>
 
 :vms_libvirt_vdisk_size_help:
 
 _(Libvirt storage location)_:
-: <input type="text" id="IMAGE_FILE" name="IMAGE_FILE" autocomplete="off" spellcheck="false" value="<?=htmlspecialchars($domain_cfg['IMAGE_FILE']);?>" placeholder="e.g. /mnt/user/system/libvirt/libvirt.img" data-pickcloseonfile="true" data-pickfilter="img" data-pickroot="/mnt" data-pickfolders="true" required pattern="^[^\\]*libvirt\.img$">
+: <input type="text" id="IMAGE_FILE" name="IMAGE_FILE" autocomplete="off" spellcheck="false" value="<?=htmlspecialchars($domain_cfg['IMAGE_FILE']);?>" placeholder="e.g. /mnt/user/system/libvirt/libvirt.img" data-pickcloseonfile="true" data-pickfilter="img" data-pickroot="/mnt" data-pickfolders="true" >
 <?if (file_exists($domain_cfg['IMAGE_FILE'])):?>
   <span id="deletePanel"><label><input type="checkbox" id="deleteCheckbox" /> _(Delete Image File)_</label></span><?endif;?>
 <?if (!$started):?>
@@ -179,6 +181,7 @@ _(Libvirt storage location)_:
 :vms_libvirt_location_help:
 
 <?endif;?>
+
 _(Default VM storage path)_:
 : <input type="text" id="domaindir" name="DOMAINDIR" autocomplete="off" spellcheck="false" data-pickfolders="true" data-pickfilter="HIDE_FILES_FILTER" data-pickroot="/mnt" value="<?=htmlspecialchars($domain_cfg['DOMAINDIR'])?>" placeholder="_(Click to Select)_" pattern="^[^\\]*/$" onchange="validatePath(this)">
 <?if (!$started):?>
@@ -286,7 +289,7 @@ _(Boot Parameter Settings)_:
 
 <?endif;?>
 
-<?if ($libvirt_up && trim(shell_exec('stat -c %T -f /etc/libvirt'))=='btrfs'):?>
+<?if ($libvirt_up && trim(shell_exec('stat -c %T -f /etc/libvirt'))=='btrfs' && substr($domain_cfg['IMAGE_FILE'], -4) === '.img') :?>
 <div class="advanced" markdown="1">
 <div class="title"><span class="left"><i class="title fa fa-list"></i>_(Libvirt volume info)_</span></div>
 _(btrfs filesystem show)_:

emhttp/plugins/dynamix.vm.manager/include/VMajax.php

@@ -282,7 +282,9 @@ function embed(&$bootcfg, $env, $key, $value) {
 
 case 'domain-delete':
 	requireLibvirt();
-	$arrResponse = $lv->domain_delete($domName)
+    $firstdisk = filter_var(_var($_REQUEST,'firstdisk', 'true'), FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE);
+    if ($firstdisk === null) $firstdisk = true;
+	$arrResponse = $lv->domain_delete($domName, $firstdisk)
 	? ['success' => true]
 	: ['error' => $lv->get_last_error()];
 	break;
@@ -484,7 +486,8 @@ function embed(&$bootcfg, $env, $key, $value) {
 	$list = glob($pathinfo['dirname']."/*");
 	$uuid = $lv->domain_get_uuid($domName);
 
-	$list2 = glob("/etc/libvirt/qemu/nvram/*$uuid*");
+	$vm_path = libvirt_get_vm_path($domName);
+	$list2 = glob(libvirt_get_nvram_dir($vm_path, $domName)."/*$uuid*");
 	$listnew = array();
 	$list=array_merge($list,$list2);
 	foreach($list as $key => $listent)

emhttp/plugins/dynamix.vm.manager/include/fs_helpers.php

@@ -0,0 +1,100 @@
+<?php
+/* Filesystem helper utilities for dynamix.vm.manager
+ * - files_identical($a,$b)
+ * - copy_if_different($src,$dst, $dry_run=false)
+ * - dir_copy($src,$dst)  (recursive, skips identical files)
+ * - dir_remove($dir)     (recursive remove)
+ */
+
+function files_identical($a, $b) {
+    if (!file_exists($a) || !file_exists($b)) return false;
+    if (filesize($a) !== filesize($b)) return false;
+    $ha = @md5_file($a);
+    $hb = @md5_file($b);
+    if ($ha === false || $hb === false) return false;
+    return $ha === $hb;
+}
+
+function copy_if_different($src, $dst, $dry_run = false) {
+    $result = [
+        'src' => $src,
+        'dst' => $dst,
+        'would_copy' => false,
+        'copied' => false,
+        'error' => null
+    ];
+
+    if (!file_exists($src)) {
+        $result['error'] = 'source not found';
+        return $result;
+    }
+
+    $dst_dir = dirname($dst);
+    if (!is_dir($dst_dir)) {
+        if ($dry_run) {
+            $result['would_copy'] = true;
+            return $result;
+        }
+        if (!@mkdir($dst_dir, 0755, true)) {
+            $result['error'] = 'failed to create dest dir';
+            return $result;
+        }
+    }
+
+    if (file_exists($dst)) {
+        if (files_identical($src, $dst)) {
+            return $result; // identical, nothing to do
+        }
+        $result['would_copy'] = true;
+    } else {
+        $result['would_copy'] = true;
+    }
+
+    if ($dry_run) return $result;
+
+    if (@copy($src, $dst)) {
+        $result['copied'] = true;
+    } else {
+        $result['error'] = 'copy_failed';
+    }
+
+    return $result;
+}
+
+function dir_copy($src, $dst) {
+    if (!is_dir($src)) return false;
+    if (!is_dir($dst)) {
+        if (!@mkdir($dst, 0755, true)) return false;
+    }
+    $items = scandir($src);
+    foreach ($items as $item) {
+        if ($item === '.' || $item === '..') continue;
+        $s = $src . DIRECTORY_SEPARATOR . $item;
+        $d = $dst . DIRECTORY_SEPARATOR . $item;
+        if (is_dir($s)) {
+            if (!dir_copy($s, $d)) return false;
+        } else {
+            if (file_exists($d)) {
+                if (files_identical($s, $d)) continue;
+            }
+            if (!@copy($s, $d)) return false;
+        }
+    }
+    return true;
+}
+
+function dir_remove($dir) {
+    if (!is_dir($dir)) return false;
+    $items = scandir($dir);
+    if ($items === false) return false;
+    foreach ($items as $item) {
+        if ($item === '.' || $item === '..') continue;
+        $path = $dir . DIRECTORY_SEPARATOR . $item;
+        if (is_dir($path)) {
+            if (!dir_remove($path)) return false;
+        } else {
+            if (!@unlink($path)) return false;
+        }
+    }
+    return @rmdir($dir);
+}