Merge remote-tracking branch 'upstream' into conan2

conanfile.py

@@ -9,7 +9,7 @@
 
 class IOMgrConan(ConanFile):
     name = "iomgr"
-    version = "11.3.3"
+    version = "11.3.4"
 
     homepage = "https://github.com/eBay/IOManager"
     description = "Asynchronous event manager"
@@ -58,6 +58,8 @@ def configure(self):
             if self.conf.get("tools.build:skip_test", default=False):
                 if self.options.coverage or self.options.sanitize:
                     raise ConanInvalidConfiguration("Coverage/Sanitizer requires Testing!")
+        if self.settings.arch != "x86_64":
+            self.options["spdk"].native_build = True
 
     def build_requirements(self):
         self.test_requires("gtest/1.14.0")

src/lib/iomgr.cpp

@@ -67,7 +67,7 @@ SISL_OPTION_GROUP(iomgr,
                   (iova_mode, "", "iova-mode", "IO Virtual Address mode ['pa'|'va']",
                    ::cxxopts::value< std::string >()->default_value("pa"), "mode"),
                   (hdd_streams, "", "hdd_streams", "Number of streams for hdd - overridden value",
-                   ::cxxopts::value< uint32_t >(), "count"))
+                   ::cxxopts::value< uint32_t >()->default_value("64"), "count"))
 
 //SISL v11 change
 SISL_LOGGING_DEF(iomgr)