github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-28 16:27:50 +00:00
Code Issues Projects Releases Wiki Activity

s390x: Fix runtime build for s390x

Browse Source 
Add the missing migration from kataVSOCK to types.VSock (see #2050) for s390x.

Fixes: #2086
Signed-off-by: Jan Schintag <jan.schintag@de.ibm.com>
This commit is contained in:
Jan Schintag 2019-09-25 10:44:28 +02:00
parent d3f480dc4c
commit c152ebf356
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
virtcontainers/qemu_s390x.go
View File

@ -246,9 +246,9 @@ func (q *qemuS390x) appendSCSIController(devices []govmmQemu.Device, enableIOThr
return devices, t, nil return devices, t, nil
} }
func (q *qemuS390x) appendVSock(devices []govmmQemu.Device, vsock kataVSOCK) ([]govmmQemu.Device, error) { func (q *qemuS390x) appendVSock(devices []govmmQemu.Device, vsock types.VSock) ([]govmmQemu.Device, error) {
var devno string var devno string
id := fmt.Sprintf("vsock-%d", vsock.contextID) id := fmt.Sprintf("vsock-%d", vsock.ContextID)
addr, b, err := q.addDeviceToBridge(id, types.CCW) addr, b, err := q.addDeviceToBridge(id, types.CCW)
if err != nil { if err != nil {
return devices, fmt.Errorf("Failed to append VSock: %v", err) return devices, fmt.Errorf("Failed to append VSock: %v", err)
@ -260,8 +260,8 @@ func (q *qemuS390x) appendVSock(devices []govmmQemu.Device, vsock kataVSOCK) ([]
devices = append(devices, devices = append(devices,
govmmQemu.VSOCKDevice{ govmmQemu.VSOCKDevice{
ID: id, ID: id,
ContextID: vsock.contextID, ContextID: vsock.ContextID,
VHostFD: vsock.vhostFd, VHostFD: vsock.VhostFd,
DisableModern: false, DisableModern: false,
DevNo: devno, DevNo: devno,
}, },