github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-16 07:05:14 +00:00
Code Issues Projects Releases Wiki Activity

clh: Set 'Id' explicitly while hotplugging block device

Browse Source 
[ Port from runtime commit 03fb9c50c180d3359178c30e06f1122df312ae76 ]

To support unplug block device, we need to set the 'Id' explicitly while
hotplugging devices with cloud-hypervisor HTTP API.

Fixes: #461

Signed-off-by: Bo Chen <chen.bo@intel.com>
This commit is contained in:
Bo Chen 2020-07-15 19:03:36 -07:00
parent 895959d007
commit 45e32e1b77
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/runtime/virtcontainers/clh.go
View File

@ -408,7 +408,11 @@ func (clh *cloudHypervisor) getThreadIDs() (vcpuThreadIDs, error) {
return vcpuInfo, nil return vcpuInfo, nil
} }
func (clh *cloudHypervisor) hotplugBlockDevice(drive *config.BlockDrive) error { func clhDriveIndexToID(i int) string {
return "clh_drive_" + strconv.Itoa(i)
}
func (clh *cloudHypervisor) hotplugAddBlockDevice(drive *config.BlockDrive) error {
if clh.config.BlockDeviceDriver != config.VirtioBlock { if clh.config.BlockDeviceDriver != config.VirtioBlock {
return fmt.Errorf("incorrect hypervisor configuration on 'block_device_driver':"+ return fmt.Errorf("incorrect hypervisor configuration on 'block_device_driver':"+
" using '%v' but only support '%v'", clh.config.BlockDeviceDriver, config.VirtioBlock) " using '%v' but only support '%v'", clh.config.BlockDeviceDriver, config.VirtioBlock)
@ -423,6 +427,8 @@ func (clh *cloudHypervisor) hotplugBlockDevice(drive *config.BlockDrive) error {
return openAPIClientError(err) return openAPIClientError(err)
} }
driveID := clhDriveIndexToID(drive.Index)
//Explicitly set PCIAddr to NULL, so that VirtPath can be used //Explicitly set PCIAddr to NULL, so that VirtPath can be used
drive.PCIAddr = "" drive.PCIAddr = ""
@ -433,6 +439,7 @@ func (clh *cloudHypervisor) hotplugBlockDevice(drive *config.BlockDrive) error {
Path: drive.File, Path: drive.File,
Readonly: drive.ReadOnly, Readonly: drive.ReadOnly,
VhostUser: false, VhostUser: false,
Id: driveID,
} }
_, _, err = cl.VmAddDiskPut(ctx, blkDevice) _, _, err = cl.VmAddDiskPut(ctx, blkDevice)
} }
@ -467,7 +474,7 @@ func (clh *cloudHypervisor) hotplugAddDevice(devInfo interface{}, devType device
switch devType { switch devType {
case blockDev: case blockDev:
drive := devInfo.(*config.BlockDrive) drive := devInfo.(*config.BlockDrive)
return nil, clh.hotplugBlockDevice(drive) return nil, clh.hotplugAddBlockDevice(drive)
case vfioDev: case vfioDev:
device := devInfo.(*config.VFIODev) device := devInfo.(*config.VFIODev)
return nil, clh.hotPlugVFIODevice(*device) return nil, clh.hotPlugVFIODevice(*device)