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

fix segfault in card because vfioContainer was shadowed in PcieCard

Browse source 
Signed-off-by: Niklas Eiling <niklas.eiling@eonerc.rwth-aachen.de>
This commit is contained in:
Niklas Eiling 2023-01-30 16:02:13 +01:00
parent 02ce5b15dc
commit 418a8dc7a9
2 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,21 +42,14 @@ public:
bool mapMemoryBlock(const MemoryBlock &block);
bool unmapMemoryBlock(const MemoryBlock &block);
private:
// Cache a set of already mapped memory blocks
std::set<MemoryManager::AddressSpaceId> memoryBlocksMapped;
std::shared_ptr<kernel::vfio::Container> vfioContainer;
std::shared_ptr<kernel::vfio::Container> vfioContainer;
protected:
// Logger getLogger() const
// {
// return villas::logging.get(name);
// }
// Cache a set of already mapped memory blocks
std::set<MemoryManager::AddressSpaceId> memoryBlocksMapped;
Logger logger;
};
} /* namespace fpga */
} /* namespace villas */
} /* namespace villas */

3
fpga/include/villas/fpga/pcie_card.hpp
View file

@ -83,9 +83,6 @@ public: // TODO: make this private
std::shared_ptr<kernel::pci::Device> pdev; // PCI device handle
// The VFIO container that this card is part of
std::shared_ptr<kernel::vfio::Container> vfioContainer;
// Slave address space ID to access the PCIe address space from the FPGA
MemoryManager::AddressSpaceId addrSpaceIdDeviceToHost;