build error fixes

Xilinx · Feb 3, 2025 · 440d721 · 440d721
1 parent 64dd641
commit 440d721
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 10 deletions.
diff --git a/src/runtime_src/core/common/query_requests.h b/src/runtime_src/core/common/query_requests.h
@@ -569,7 +569,7 @@ struct xrt_smi_lists : request
   static const char* name() { return "xrt_smi_lists"; }
 
   virtual std::any
-  get(const device*) const override = 0;
+  get(const device*, const std::any& req_type) const override = 0;
 
   // formatting of individual items for the vector
   static std::string

diff --git a/src/runtime_src/core/edge/user/device_linux.cpp b/src/runtime_src/core/edge/user/device_linux.cpp
@@ -708,15 +708,15 @@ struct xrt_smi_lists
   using result_type = std::any;
 
   static result_type
-  user(const xrt_core::device* /*device*/, xrt_key_type key)
+  get(const xrt_core::device* /*device*/, key_type key)
   {
     throw xrt_core::query::no_such_key(key, "Not implemented");
   }
 
   static result_type
-  user(const xrt_core::device* /*device*/, xrt_key_type key, const std::any& reqType)
+  get(const xrt_core::device* /*device*/, key_type key, const std::any& reqType)
   {
-    if (key != xrt_key_type::xrt_smi_lists)
+    if (key != key_type::xrt_smi_lists)
       throw xrt_core::query::no_such_key(key, "Not implemented");
 
     const auto xrt_smi_lists_type = std::any_cast<xrt_core::query::xrt_smi_lists::type>(reqType);

diff --git a/src/runtime_src/core/edge/user/smi.h b/src/runtime_src/core/edge/user/smi.h
@@ -13,4 +13,10 @@ class smi_edge : public xrt_core::smi::smi_base {
 
 /* This API can be device specific since this is used by the shim*/
 std::string get_smi_config();
+
+const xrt_core::smi::tuple_vector&
+get_validate_tests();
+
+const xrt_core::smi::tuple_vector&
+get_examine_reports();
 } // namespace shim_edge::smi
diff --git a/src/runtime_src/core/pcie/linux/device_linux.cpp b/src/runtime_src/core/pcie/linux/device_linux.cpp
@@ -936,15 +936,15 @@ struct xrt_smi_lists
   using result_type = std::any;
 
   static result_type
-  user(const xrt_core::device* /*device*/, xrt_key_type key)
+  get(const xrt_core::device* /*device*/, key_type key)
   {
     throw xrt_core::query::no_such_key(key, "Not implemented");
   }
 
   static result_type
-  user(const xrt_core::device* /*device*/, xrt_key_type key, const std::any& reqType)
+  get(const xrt_core::device* /*device*/, key_type key, const std::any& reqType)
   {
-    if (key != xrt_key_type::xrt_smi_lists)
+    if (key != key_type::xrt_smi_lists)
       throw xrt_core::query::no_such_key(key, "Not implemented");
 
     const auto xrt_smi_lists_type = std::any_cast<xrt_core::query::xrt_smi_lists::type>(reqType);

diff --git a/src/runtime_src/core/pcie/linux/smi.h b/src/runtime_src/core/pcie/linux/smi.h
@@ -15,9 +15,9 @@ class smi_pcie : public xrt_core::smi::smi_base {
 std::string
 get_smi_config();
 
-std::vector<std::string>
+const xrt_core::smi::tuple_vector&
 get_validate_tests();
 
-std::vector<std::string>
+const xrt_core::smi::tuple_vector&
 get_examine_reports();
 } // namespace shim_pcie::smi
diff --git a/src/runtime_src/core/tools/xbutil2/SubCmdValidate.cpp b/src/runtime_src/core/tools/xbutil2/SubCmdValidate.cpp
@@ -727,5 +727,5 @@ SubCmdValidate::getTestList(const xrt_core::smi::tuple_vector& tests) const
     }
   }
 
-  return std::move(matchedTests);
+  return matchedTests;
 }
-Original file line number
+Diff line change
@@ Expand Up @@
         }
       }
-      return std::move(matchedTests);
+      return matchedTests;
     }