From 80386d1085f3110cd6e3fbf80337887bf121c564 Mon Sep 17 00:00:00 2001 From: Daniel Krebs Date: Tue, 24 Apr 2018 13:11:25 +0200 Subject: [PATCH] vfio: correctly set container on group --- fpga/include/villas/kernel/vfio.hpp | 2 +- fpga/lib/kernel/vfio.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/fpga/include/villas/kernel/vfio.hpp b/fpga/include/villas/kernel/vfio.hpp index 1a09e2e16..473873d04 100644 --- a/fpga/include/villas/kernel/vfio.hpp +++ b/fpga/include/villas/kernel/vfio.hpp @@ -91,7 +91,7 @@ public: ~VfioGroup(); static std::unique_ptr - attach(const VfioContainer& container, int groupIndex); + attach(VfioContainer& container, int groupIndex); private: /// VFIO group file descriptor diff --git a/fpga/lib/kernel/vfio.cpp b/fpga/lib/kernel/vfio.cpp index 67cc6d19e..2bf90b590 100644 --- a/fpga/lib/kernel/vfio.cpp +++ b/fpga/lib/kernel/vfio.cpp @@ -743,10 +743,12 @@ VfioGroup::~VfioGroup() std::unique_ptr -VfioGroup::attach(const VfioContainer& container, int groupIndex) +VfioGroup::attach(VfioContainer& container, int groupIndex) { std::unique_ptr group { new VfioGroup(groupIndex) }; + group->container = &container; + /* Open group fd */ std::stringstream groupPath; groupPath << VFIO_PATH