github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-04 11:06:21 +00:00
Code Issues Projects Releases Wiki Activity

virtcontainers: fix sandbox store struct VFIODevice bug

Browse Source 
Since struct VFIODevice needed to be stored into disk by storeSandboxDevices() function,
however struct VFIODevice has a field named "vfioDevs", which is named begin with lower-case,
so it can't be written into file by json.Marshal.And this bug will will cause hotplug vfio
device can not been removed correctly while container exits.

Fixes: #924

Signed-off-by: flyflypeng <jiangpengfei9@huawei.com>
This commit is contained in:
j00444339 2018-11-20 08:36:47 -05:00
parent ccc41d7363
commit cba7a882aa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
virtcontainers/device/drivers/vfio.go
View File

@ -32,7 +32,7 @@ const (
// to be used by the Virtual Machine. // to be used by the Virtual Machine.
type VFIODevice struct { type VFIODevice struct {
*GenericDevice *GenericDevice
vfioDevs []*config.VFIODev VfioDevs []*config.VFIODev
} }
// NewVFIODevice create a new VFIO device // NewVFIODevice create a new VFIO device
@ -77,7 +77,7 @@ func (device *VFIODevice) Attach(devReceiver api.DeviceReceiver) error {
BDF: deviceBDF, BDF: deviceBDF,
SysfsDev: deviceSysfsDev, SysfsDev: deviceSysfsDev,
} }
device.vfioDevs = append(device.vfioDevs, vfio) device.VfioDevs = append(device.VfioDevs, vfio)
} }
// hotplug a VFIO device is actually hotplugging a group of iommu devices // hotplug a VFIO device is actually hotplugging a group of iommu devices
@ -126,7 +126,7 @@ func (device *VFIODevice) DeviceType() config.DeviceType {
// GetDeviceInfo returns device information used for creating // GetDeviceInfo returns device information used for creating
func (device *VFIODevice) GetDeviceInfo() interface{} { func (device *VFIODevice) GetDeviceInfo() interface{} {
return device.vfioDevs return device.VfioDevs
} }
// It should implement GetAttachCount() and DeviceID() as api.Device implementation // It should implement GetAttachCount() and DeviceID() as api.Device implementation