Don't overwrite vm settings during create from backup + nas backup fix

Author: abh1sar

scripts/vm/hypervisor/kvm/nasbackup.sh

@@ -288,8 +288,8 @@ done
 sanity_checks
 
 if [ "$OP" = "backup" ]; then
-  STATE=$(virsh -c qemu:///system list | grep $VM | awk '{print $3}')
-  if [ "$STATE" = "running" ]; then
+  STATE=$(virsh -c qemu:///system list | awk -v vm="$VM" '$2 == vm {print $3}')
+  if [ -n "$STATE" ] && [ "$STATE" = "running" ]; then
     backup_running_vm
   else
     backup_stopped_vm

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -9549,7 +9549,9 @@ public UserVm allocateVMFromBackup(CreateVMFromBackupCmd cmd) throws Insufficien
             Type type = new TypeToken<Map<String, String>>(){}.getType();
             Map<String, String> vmDetailsFromBackup = new Gson().fromJson(vmSettingsFromBackup, type);
             for (Map.Entry<String, String> entry : vmDetailsFromBackup.entrySet()) {
-                vmVO.setDetail(entry.getKey(), entry.getValue());
+                if (!details.containsKey(entry.getKey())) {
+                    vmVO.setDetail(entry.getKey(), entry.getValue());
+                }
             }
             _vmDao.saveDetails(vmVO);
         }