do not use sai_query_api_version if vendor sai does not support in Ve…

…ndorSai.cpp (sonic-net#1064) introduce function check if sai_query_api_version exists or not configure.ac. If not, then do not call this function in the syncd. Signed-off-by: Guohan Lu <[email protected]>
Pterosaur · Jun 13, 2022 · 48cccb4 · 48cccb4
1 parent 9b0f773
commit 48cccb4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/configure.ac b/configure.ac
@@ -186,7 +186,7 @@ AM_COND_IF([SYNCD], [
 AM_COND_IF([SAIVS], [], [
 SAVED_FLAGS="$CXXFLAGS"
 CXXFLAGS="-lsai -I$srcdir/SAI/inc -I$srcdir/SAI/experimental -I$srcdir/SAI/meta"
-AC_CHECK_FUNC(sai_query_api_version, [
+AC_CHECK_FUNCS(sai_query_api_version, [
 AC_MSG_CHECKING([SAI headers API version and library version check])
 AC_TRY_RUN([
 extern "C" {

diff --git a/syncd/VendorSai.cpp b/syncd/VendorSai.cpp
@@ -58,13 +58,14 @@ sai_status_t VendorSai::initialize(
         return SAI_STATUS_INVALID_PARAMETER;
     }
 
+#ifdef HAVE_SAI_QUERY_API_VERSION
     sai_api_version_t version{};
-    auto status = sai_query_api_version(&version);
-    if (status != SAI_STATUS_SUCCESS)
+    auto api_status = sai_query_api_version(&version);
+    if (api_status != SAI_STATUS_SUCCESS)
     {
         SWSS_LOG_ERROR("failed to query SAI API version");
 
-        return status;
+        return api_status;
     }
 
     SWSS_LOG_NOTICE("SAI API version: %" PRId64, version);
@@ -76,10 +77,11 @@ sai_status_t VendorSai::initialize(
 
         return SAI_STATUS_FAILURE;
     }
+#endif
 
     memcpy(&m_service_method_table, service_method_table, sizeof(m_service_method_table));
 
-    status = sai_api_initialize(flags, service_method_table);
+    auto status = sai_api_initialize(flags, service_method_table);
 
     if (status == SAI_STATUS_SUCCESS)
     {