address comments

Author: vishesh92

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

@@ -6589,10 +6589,7 @@ private VMInstanceVO preVmStorageMigrationCheck(Long vmId) {
         }
 
         HypervisorType hypervisorType = vm.getHypervisorType();
-        if (vm.getType() != VirtualMachine.Type.User &&
-                (!hypervisorType.isFunctionalitySupported(HypervisorType.Functionality.VmStorageMigration)
-                        || hypervisorType.equals(HypervisorType.XenServer))) {
-
+        if (!hypervisorSupportsNonUserVMStorageMigration(vm, hypervisorType)) {
             List<HypervisorType> supportedHypervisors = HypervisorType.getListOfHypervisorsSupportingFunctionality(HypervisorType.Functionality.VmStorageMigration)
                     .stream().filter(hypervisor -> !hypervisor.equals(HypervisorType.XenServer)).collect(Collectors.toList());
             throw new InvalidParameterValueException(String.format(
@@ -6614,6 +6611,12 @@ private VMInstanceVO preVmStorageMigrationCheck(Long vmId) {
         return vm;
     }
 
+    private boolean hypervisorSupportsNonUserVMStorageMigration(VirtualMachine  vm, HypervisorType hypervisorType) {
+        return vm.getType() == VirtualMachine.Type.User ||
+                (hypervisorType.isFunctionalitySupported(HypervisorType.Functionality.VmStorageMigration)
+                        && !hypervisorType.equals(HypervisorType.XenServer));
+    }
+
     private VirtualMachine findMigratedVm(long vmId, VirtualMachine.Type vmType) {
         if (VirtualMachine.Type.User.equals(vmType)) {
             return _vmDao.findById(vmId);