blk-dev: hotplug read only if applicable

egernst · egernst · commit dcaabed6b426 · 2021-01-12T17:03:05.000-08:00
If a block based volume is read only, let's make sure we add as a RO device Fixes: #3114 Signed-off-by: Eric Ernst <eric.g.ernst@gmail.com>
diff --git a/virtcontainers/container.go b/virtcontainers/container.go
@@ -680,6 +680,7 @@ func (c *Container) createBlockDevices() error {
 				DevType:       "b",
 				Major:         int64(unix.Major(stat.Rdev)),
 				Minor:         int64(unix.Minor(stat.Rdev)),
+				ReadOnly:      m.ReadOnly,
 			}
 			// check whether source can be used as a pmem device
 		} else if di, err = config.PmemDeviceInfo(m.Source, m.Destination); err != nil {
diff --git a/virtcontainers/device/config/config.go b/virtcontainers/device/config/config.go
@@ -114,6 +114,9 @@ type DeviceInfo struct {
 	// for a nvdimm device in the guest.
 	Pmem bool
 
+	// If applicable, should this device be considered RO
+	ReadOnly bool
+
 	// ColdPlug specifies whether the device must be cold plugged (true)
 	// or hot plugged (false).
 	ColdPlug bool
diff --git a/virtcontainers/device/drivers/block.go b/virtcontainers/device/drivers/block.go
@@ -61,11 +61,12 @@ func (device *BlockDevice) Attach(devReceiver api.DeviceReceiver) (err error) {
 	}
 
 	drive := &config.BlockDrive{
-		File:   device.DeviceInfo.HostPath,
-		Format: "raw",
-		ID:     utils.MakeNameID("drive", device.DeviceInfo.ID, maxDevIDSize),
-		Index:  index,
-		Pmem:   device.DeviceInfo.Pmem,
+		File:     device.DeviceInfo.HostPath,
+		Format:   "raw",
+		ID:       utils.MakeNameID("drive", device.DeviceInfo.ID, maxDevIDSize),
+		Index:    index,
+		Pmem:     device.DeviceInfo.Pmem,
+		ReadOnly: device.DeviceInfo.ReadOnly,
 	}
 
 	if fs, ok := device.DeviceInfo.DriverOptions["fstype"]; ok {
diff --git a/virtcontainers/qemu.go b/virtcontainers/qemu.go
@@ -1105,9 +1105,9 @@ func (q *qemu) hotplugAddBlockDevice(drive *config.BlockDrive, op operation, dev
 	}
 
 	if q.config.BlockDeviceCacheSet {
-		err = q.qmpMonitorCh.qmp.ExecuteBlockdevAddWithCache(q.qmpMonitorCh.ctx, drive.File, drive.ID, q.config.BlockDeviceCacheDirect, q.config.BlockDeviceCacheNoflush, false)
+		err = q.qmpMonitorCh.qmp.ExecuteBlockdevAddWithCache(q.qmpMonitorCh.ctx, drive.File, drive.ID, q.config.BlockDeviceCacheDirect, q.config.BlockDeviceCacheNoflush, drive.ReadOnly)
 	} else {
-		err = q.qmpMonitorCh.qmp.ExecuteBlockdevAdd(q.qmpMonitorCh.ctx, drive.File, drive.ID, false)
+		err = q.qmpMonitorCh.qmp.ExecuteBlockdevAdd(q.qmpMonitorCh.ctx, drive.File, drive.ID, drive.ReadOnly)
 	}
 	if err != nil {
 		return err

Original file line number	Diff line number	Diff line change
`@@ -680,6 +680,7 @@ func (c *Container) createBlockDevices() error {`
`680`	`680`	`DevType: "b",`
`681`	`681`	`Major: int64(unix.Major(stat.Rdev)),`
`682`	`682`	`Minor: int64(unix.Minor(stat.Rdev)),`
	`683`	`+ ReadOnly: m.ReadOnly,`
`683`	`684`	`}`
`684`	`685`	`// check whether source can be used as a pmem device`
`685`	`686`	`} else if di, err = config.PmemDeviceInfo(m.Source, m.Destination); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -1105,9 +1105,9 @@ func (q qemu) hotplugAddBlockDevice(drive config.BlockDrive, op operation, dev`
`1105`	`1105`	`}`
`1106`	`1106`
`1107`	`1107`	`if q.config.BlockDeviceCacheSet {`
`1108`		`- err = q.qmpMonitorCh.qmp.ExecuteBlockdevAddWithCache(q.qmpMonitorCh.ctx, drive.File, drive.ID, q.config.BlockDeviceCacheDirect, q.config.BlockDeviceCacheNoflush, false)`
	`1108`	`+ err = q.qmpMonitorCh.qmp.ExecuteBlockdevAddWithCache(q.qmpMonitorCh.ctx, drive.File, drive.ID, q.config.BlockDeviceCacheDirect, q.config.BlockDeviceCacheNoflush, drive.ReadOnly)`
`1109`	`1109`	`} else {`
`1110`		`- err = q.qmpMonitorCh.qmp.ExecuteBlockdevAdd(q.qmpMonitorCh.ctx, drive.File, drive.ID, false)`
	`1110`	`+ err = q.qmpMonitorCh.qmp.ExecuteBlockdevAdd(q.qmpMonitorCh.ctx, drive.File, drive.ID, drive.ReadOnly)`
`1111`	`1111`	`}`
`1112`	`1112`	`if err != nil {`
`1113`	`1113`	`return err`