Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

bump common subrepo and use shared pointers for vfio::Container

Browse source 
Signed-off-by: Niklas Eiling <niklas.eiling@eonerc.rwth-aachen.de>
This commit is contained in:
Niklas Eiling 2022-12-05 09:31:37 +01:00
parent 404bc9c8be
commit 1fecb66fb3
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fpga/common

@ -1 +1 @@
Subproject commit 8dcf83bf0fbc258bb54db2434df796255119213f
Subproject commit 1912f2106453cea3a20358942ad7f360b2129bc3

4
fpga/include/villas/fpga/card.hpp
View file

@ -111,7 +111,7 @@ public: // TODO: make this private
std::shared_ptr<kernel::pci::Device> pdev; // PCI device handle
// The VFIO container that this card is part of
kernel::vfio::Container* vfioContainer;
std::shared_ptr<kernel::vfio::Container> vfioContainer;
// The VFIO device that represents this card
std::shared_ptr<kernel::vfio::Device> vfioDevice;
@ -137,7 +137,7 @@ class PCIeCardFactory : public plugin::Plugin {
public:
static Card::List
make(json_t *json, std::shared_ptr<kernel::pci::DeviceList> pci, kernel::vfio::Container* vc);
make(json_t *json, std::shared_ptr<kernel::pci::DeviceList> pci, std::shared_ptr<kernel::vfio::Container> vc);
static PCIeCard*
create()

2
fpga/lib/card.cpp
View file

@ -42,7 +42,7 @@ static PCIeCardFactory villas::fpga::PCIeCardFactory;
static const kernel::pci::Device defaultFilter((kernel::pci::Id(FPGA_PCI_VID_XILINX, FPGA_PCI_PID_VFPGA)));
PCIeCard::List
PCIeCardFactory::make(json_t *json, std::shared_ptr<kernel::pci::DeviceList> pci, kernel::vfio::Container* vc)
PCIeCardFactory::make(json_t *json, std::shared_ptr<kernel::pci::DeviceList> pci, std::shared_ptr<kernel::vfio::Container> vc)
{
PCIeCard::List cards;
auto logger = getStaticLogger();

2
fpga/lib/fpgaHelper.cpp
View file

@ -73,7 +73,7 @@ fpga::setupFpgaCard(const std::string &configFile, const std::string &fpgaName)
{
pciDevices = std::make_shared<kernel::pci::DeviceList>();
auto vfioContainer = kernel::vfio::Container::getInstance();
auto vfioContainer = std::make_shared<kernel::vfio::Container>();
// Parse FPGA configuration
FILE* f = fopen(configFile.c_str(), "r");

2
fpga/tests/unit/fpga.cpp
View file

@ -56,7 +56,7 @@ static void init()
pciDevices = std::make_shared<kernel::pci::DeviceList>();
auto vfioContainer = kernel::vfio::Container::getInstance();
auto vfioContainer = std::make_shared<kernel::vfio::Container>();
// Parse FPGA configuration
char *fn = getenv("TEST_CONFIG");