From d24a323e5c26c9efe13025a7b121356dd81d3837 Mon Sep 17 00:00:00 2001
From: Niklas Eiling <niklas.eiling@eonerc.rwth-aachen.de>
Date: Mon, 26 Feb 2024 11:38:10 +0100
Subject: [PATCH] utils: remove cards from createCard

Signed-off-by: Niklas Eiling <niklas.eiling@eonerc.rwth-aachen.de>
---
 fpga/include/villas/fpga/utils.hpp |  3 +--
 fpga/lib/utils.cpp                 | 10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/fpga/include/villas/fpga/utils.hpp b/fpga/include/villas/fpga/utils.hpp
index 26051b3cc..96ce975af 100644
--- a/fpga/include/villas/fpga/utils.hpp
+++ b/fpga/include/villas/fpga/utils.hpp
@@ -18,8 +18,7 @@ std::shared_ptr<fpga::Card>
 setupFpgaCard(const std::string &configFile, const std::string &fpgaName);
 
 std::shared_ptr<fpga::Card>
-createCard(json_t *config, std::list<std::shared_ptr<fpga::Card>> &cards,
-           std::filesystem::path &searchPath,
+createCard(json_t *config, std::filesystem::path &searchPath,
            std::shared_ptr<kernel::vfio::Container> vfioContainer,
            std::string card_name = "anonymous Card");
 int createCards(json_t *config, std::list<std::shared_ptr<fpga::Card>> &cards,
diff --git a/fpga/lib/utils.cpp b/fpga/lib/utils.cpp
index 2a766ce76..6d2a612a8 100644
--- a/fpga/lib/utils.cpp
+++ b/fpga/lib/utils.cpp
@@ -226,8 +226,7 @@ void fpga::setupColorHandling()
 }
 
 std::shared_ptr<fpga::Card>
-fpga::createCard(json_t *config, std::list<std::shared_ptr<fpga::Card>> &cards,
-                 std::filesystem::path &searchPath,
+fpga::createCard(json_t *config, std::filesystem::path &searchPath,
                  std::shared_ptr<kernel::vfio::Container> vfioContainer,
                  std::string card_name) {
   auto configDir = std::filesystem::path().parent_path();
@@ -246,7 +245,6 @@ fpga::createCard(json_t *config, std::list<std::shared_ptr<fpga::Card>> &cards,
     auto card = fpga::PCIeCardFactory::make(config, std::string(card_name),
                                             vfioContainer, searchPath);
     if (card) {
-      cards.push_back(card);
       return card;
     }
     return nullptr;
@@ -275,9 +273,11 @@ int fpga::createCards(json_t *config,
 
   const char *card_name;
   json_t *json_card;
+  std::shared_ptr<fpga::Card> card;
   json_object_foreach(fpgas, card_name, json_card) {
-    if (createCard(json_card, cards, searchPath, vfioContainer, card_name) !=
-        nullptr) {
+    card = createCard(json_card, searchPath, vfioContainer, card_name);
+    if (card != nullptr) {
+      cards.push_back(card);
       numFpgas++;
     }
   }