runtime: Disable disable-modern for virtio QMP add

History: the previous version of kvm (unknown) and qemu-lite had an issue using virtio 1.0 version when it came to device hotplug, which led to the team to disable 1.0 version of virtio for hotplug (set disable-modern=on). Please check containers/virtcontainers@e99f6b2 for further info. We have since moved to QEMU4.0 and probably a later version of kvm as default across all distros. Trying to enable virtio1.0 for all hotplugs to see if that works for Kata. Fixes: #12341234 Signed-off-by: Ganesh Maharaj Mahalingam <[email protected]>
kata-containers · Jul 9, 2019 · 8ba4e30 · 8ba4e30
1 parent 6538d3e
commit 8ba4e30
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/virtcontainers/qemu.go b/virtcontainers/qemu.go
@@ -953,7 +953,7 @@ func (q *qemu) hotplugAddBlockDevice(drive *config.BlockDrive, op operation, dev
 		// PCI address is in the format bridge-addr/device-addr eg. "03/02"
 		drive.PCIAddr = fmt.Sprintf("%02x", bridge.Addr) + "/" + addr
 
-		if err = q.qmpMonitorCh.qmp.ExecutePCIDeviceAdd(q.qmpMonitorCh.ctx, drive.ID, devID, driver, addr, bridge.ID, romFile, 0, true, q.arch.runNested()); err != nil {
+		if err = q.qmpMonitorCh.qmp.ExecutePCIDeviceAdd(q.qmpMonitorCh.ctx, drive.ID, devID, driver, addr, bridge.ID, romFile, 0, true, false); err != nil {
 			return err
 		}
 	} else {
@@ -968,7 +968,7 @@ func (q *qemu) hotplugAddBlockDevice(drive *config.BlockDrive, op operation, dev
 			return err
 		}
 
-		if err = q.qmpMonitorCh.qmp.ExecuteSCSIDeviceAdd(q.qmpMonitorCh.ctx, drive.ID, devID, driver, bus, romFile, scsiID, lun, true, q.arch.runNested()); err != nil {
+		if err = q.qmpMonitorCh.qmp.ExecuteSCSIDeviceAdd(q.qmpMonitorCh.ctx, drive.ID, devID, driver, bus, romFile, scsiID, lun, true, false); err != nil {
 			return err
 		}
 	}
@@ -1119,7 +1119,7 @@ func (q *qemu) hotplugNetDevice(endpoint Endpoint, op operation) error {
 		if machine.Type == QemuCCWVirtio {
 			return q.qmpMonitorCh.qmp.ExecuteNetCCWDeviceAdd(q.qmpMonitorCh.ctx, tap.Name, devID, endpoint.HardwareAddr(), addr, bridge.ID, int(q.config.NumVCPUs))
 		}
-		return q.qmpMonitorCh.qmp.ExecuteNetPCIDeviceAdd(q.qmpMonitorCh.ctx, tap.Name, devID, endpoint.HardwareAddr(), addr, bridge.ID, romFile, int(q.config.NumVCPUs), q.arch.runNested())
+		return q.qmpMonitorCh.qmp.ExecuteNetPCIDeviceAdd(q.qmpMonitorCh.ctx, tap.Name, devID, endpoint.HardwareAddr(), addr, bridge.ID, romFile, int(q.config.NumVCPUs), false)
 	}
 
 	if err := q.removeDeviceFromBridge(tap.ID); err != nil {