Update pr9823: add new method

weizhouapache · Oct 28, 2024 · 89eb4eb · 89eb4eb
1 parent e381ded
commit 89eb4eb
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/...rvisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/...rvisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -2585,13 +2585,7 @@ protected DevicesDef createDevicesDef(VirtualMachineTO vmTO, GuestDef guest, int
             Map<String, String> details = vmTO.getDetails();
 
             boolean isIothreadsEnabled = details != null && details.containsKey(VmDetailConstants.IOTHREADS);
-            int controllers = vmTO.getDisks().length / 7;
-            if (vmTO.getDisks().length % 7 != 0) {
-                controllers++;
-            }
-            for (int i = 0; i < controllers; i++) {
-                devices.addDevice(createSCSIDef((short)i, vcpus, isIothreadsEnabled));
-            }
+            addSCSIControllers(devices, vcpus, vmTO.getDisks().length, isIothreadsEnabled);
         }
         return devices;
     }
@@ -2633,6 +2627,17 @@ protected SCSIDef createSCSIDef(short index, int vcpus, boolean isIothreadsEnabl
         return new SCSIDef(index, 0, 0, 9 + index, 0, vcpus, isIothreadsEnabled);
     }
 
+
+    private void addSCSIControllers(DevicesDef devices, int vcpus, int diskCount, boolean isIothreadsEnabled) {
+        int controllers = diskCount / 7;
+        if (diskCount % 7 != 0) {
+            controllers++;
+        }
+        for (int i = 0; i < controllers; i++) {
+            devices.addDevice(createSCSIDef((short)i, vcpus, isIothreadsEnabled));
+        }
+    }
+
     protected ConsoleDef createConsoleDef() {
         return new ConsoleDef(PTY, null, null, (short)0);
     }