From 10b8878279d39a7d33e4f86a663751239a2edd66 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Wed, 8 Jul 2020 15:10:26 +0200 Subject: [PATCH] fix naming of factories --- fpga/src/villas-fpga-pipe.cpp | 6 +++--- fpga/tests/fpga.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fpga/src/villas-fpga-pipe.cpp b/fpga/src/villas-fpga-pipe.cpp index 7a33135cf..f13be7aed 100644 --- a/fpga/src/villas-fpga-pipe.cpp +++ b/fpga/src/villas-fpga-pipe.cpp @@ -92,14 +92,14 @@ setupFpgaCard(const std::string &configFile, const std::string &fpgaName) } // get the FPGA card plugin - auto fpgaCardPlugin = plugin::Registry::lookup("pcie"); - if (fpgaCardPlugin == nullptr) { + auto fpgaCardFactory = plugin::Registry::lookup("pcie"); + if (fpgaCardFactory == nullptr) { logger->error("No FPGA plugin found"); exit(1); } // create all FPGA card instances using the corresponding plugin - auto cards = fpgaCardPlugin->make(fpgas, pciDevices, vfioContainer); + auto cards = fpgaCardFactory->make(fpgas, pciDevices, vfioContainer); for (auto &fpgaCard : cards) { if (fpgaCard->name == fpgaName) { diff --git a/fpga/tests/fpga.cpp b/fpga/tests/fpga.cpp index b71569056..58e3dd4f2 100644 --- a/fpga/tests/fpga.cpp +++ b/fpga/tests/fpga.cpp @@ -73,11 +73,11 @@ static void init() cr_assert(json_object_size(json) > 0, "No FPGAs defined in config"); // get the FPGA card plugin - auto fpgaCardPlugin = plugin::Registry::lookup("pcie"); - cr_assert_not_null(fpgaCardPlugin, "No plugin for FPGA card found"); + auto fpgaCardFactory = plugin::Registry::lookup("pcie"); + cr_assert_not_null(fpgaCardFactory, "No plugin for FPGA card found"); // create all FPGA card instances using the corresponding plugin - state.cards = fpgaCardPlugin->make(fpgas, pciDevices, vfioContainer); + state.cards = fpgaCardFactory->make(fpgas, pciDevices, vfioContainer); cr_assert(state.cards.size() != 0, "No FPGA cards found!");