Merge pull request #3 from mcastelino/topic/virtio-mmio

HACK: The VmPath is not getting properly populated
mcastelino · Dec 6, 2018 · 3e237af · 3e237af
2 parents 8e12712 + ec07e0f
commit 3e237af
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/virtcontainers/device/drivers/block.go b/virtcontainers/device/drivers/block.go
@@ -73,8 +73,13 @@ func (device *BlockDevice) Attach(devReceiver api.DeviceReceiver) (err error) {
 	}
 
 	customOptions := device.DeviceInfo.DriverOptions
-	if customOptions != nil && customOptions["block-driver"] == "virtio-blk" {
-		drive.VirtPath = filepath.Join("/dev", driveName)
+	if customOptions != nil {
+		if customOptions["block-driver"] == "virtio-blk" {
+			drive.VirtPath = filepath.Join("/dev", driveName)
+		}
+		if customOptions["block-driver"] == "virtio-mmio" {
+			drive.VirtPath = filepath.Join("/dev", driveName)
+		}
 	} else {
 		scsiAddr, err := utils.GetSCSIAddress(index)
 		if err != nil {

diff --git a/virtcontainers/kata_agent.go b/virtcontainers/kata_agent.go
@@ -858,7 +858,10 @@ func (k *kataAgent) appendDevices(deviceList []*grpc.Device, c *Container) []*gr
 			ContainerPath: dev.ContainerPath,
 		}
 
-		if d.SCSIAddr == "" {
+		if d.VirtPath != "" {
+			kataDevice.Type = kataMmioBlkDevType
+			kataDevice.Id = d.VirtPath
+		} else if d.SCSIAddr == "" {
 			kataDevice.Type = kataBlkDevType
 			kataDevice.Id = d.PCIAddr
 		} else {
@@ -1283,6 +1286,9 @@ func (k *kataAgent) handleBlockVolumes(c *Container) []*grpc.Storage {
 		if c.sandbox.config.HypervisorConfig.BlockDeviceDriver == VirtioBlock {
 			vol.Driver = kataBlkDevType
 			vol.Source = blockDrive.PCIAddr
+		} else if c.sandbox.config.HypervisorConfig.BlockDeviceDriver == VirtioMmio {
+			vol.Driver = kataMmioBlkDevType
+			vol.Source = blockDrive.VirtPath
 		} else {
 			vol.Driver = kataSCSIDevType
 			vol.Source = blockDrive.SCSIAddr