shapeblue
diff --git a/‎agent/conf/agent.properties‎
Lines changed: 1 addition & 1 deletion b/‎agent/conf/agent.properties‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎agent/src/main/java/com/cloud/agent/properties/AgentProperties.java‎
Lines changed: 3 additions & 3 deletions b/‎agent/src/main/java/com/cloud/agent/properties/AgentProperties.java‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java‎
Lines changed: 12 additions & 3 deletions b/‎plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java‎
Lines changed: 12 additions & 3 deletions
@@ -286,5 +286,5 @@ iscsi.session.cleanup.enabled=false
 # Enable manually setting CPU's topology on KVM's VM.
 # enable.manually.setting.cpu.topology.on.kvm.vm=true
 
-# Enable/disable IO driver for Qemu (requires an io_uring supported qemu version)
+# Enable/disable IO driver for Qemu (in case it is not set CloudStack can also detect if its supported by qemu)
 # enable.io.uring=true
@@ -55,11 +55,11 @@ public class AgentProperties{
     public static final Property<Boolean> ENABLE_MANUALLY_SETTING_CPU_TOPOLOGY_ON_KVM_VM = new Property<Boolean>("enable.manually.setting.cpu.topology.on.kvm.vm", true);
 
     /**
-     * Enable manually IO driver on KVM's VM. To be applied it also requires qemu supports io_uring <br>
+     * Enable manually IO driver on KVM's VM. If it is not manually enabled CloudStack can detect if its available<br>
      * Data type: boolean.<br>
-     * Default value: true.
+     * Default value: null.
      */
-    public static final Property<Boolean> ENABLE_IO_URING = new Property<>("enable.io.uring", true);
+    public static final Property<Boolean> ENABLE_IO_URING = new Property<>("enable.io.uring", null);
 
     public static class Property <T>{
         private final String name;
 
@@ -2964,7 +2964,7 @@ protected boolean isIoUringSupportedByQemu() {
     }
 
     protected String getIoUringCheckCommand() {
-        String[] qemuPaths = {"/usr/bin/qemu-system-x86_64", "/usr/libexec/qemu-kvm", "/usr/bin/qemu-kvm" };
+        String[] qemuPaths = { "/usr/bin/qemu-system-x86_64", "/usr/libexec/qemu-kvm", "/usr/bin/qemu-kvm" };
         for (String qemuPath : qemuPaths) {
             File file = new File(qemuPath);
             if (file.exists()) {
@@ -2991,10 +2991,19 @@ && isIoUringEnabled()) {
     }
 
     /**
-     * IO_URING supported if it is supported by qemu AND the property 'enable.io.uring' is set to true
+     * IO_URING supported if the property 'enable.io.uring' is set to true OR it is supported by qemu
      */
     private boolean isIoUringEnabled() {
-        return isIoUringSupportedByQemu() && AgentPropertiesFileHandler.getPropertyValue(AgentProperties.ENABLE_IO_URING);
+        Boolean propertyValue = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.ENABLE_IO_URING);
+        return BooleanUtils.isTrue(propertyValue) || isBaseOsUbuntu() || isIoUringSupportedByQemu();
+    }
+
+    private boolean isBaseOsUbuntu() {
+        Map<String, String> versionString = getVersionStrings();
+        if (MapUtils.isEmpty(versionString) || !versionString.containsKey("Host.OS") || versionString.get("Host.OS") == null) {
+            return false;
+        }
+        return versionString.get("Host.OS").equalsIgnoreCase("ubuntu");
     }
 
     private KVMPhysicalDisk getPhysicalDiskFromNfsStore(String dataStoreUrl, DataTO data) {