From c152ebf35602e4d8cb75d0e717fcb3df9c975446 Mon Sep 17 00:00:00 2001 From: Jan Schintag Date: Wed, 25 Sep 2019 10:44:28 +0200 Subject: [PATCH] s390x: Fix runtime build for s390x Add the missing migration from kataVSOCK to types.VSock (see #2050) for s390x. Fixes: #2086 Signed-off-by: Jan Schintag --- virtcontainers/qemu_s390x.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/virtcontainers/qemu_s390x.go b/virtcontainers/qemu_s390x.go index c5d0b8be00..5c5b16bc75 100644 --- a/virtcontainers/qemu_s390x.go +++ b/virtcontainers/qemu_s390x.go @@ -246,9 +246,9 @@ func (q *qemuS390x) appendSCSIController(devices []govmmQemu.Device, enableIOThr 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 - id := fmt.Sprintf("vsock-%d", vsock.contextID) + id := fmt.Sprintf("vsock-%d", vsock.ContextID) addr, b, err := q.addDeviceToBridge(id, types.CCW) if err != nil { 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, govmmQemu.VSOCKDevice{ ID: id, - ContextID: vsock.contextID, - VHostFD: vsock.vhostFd, + ContextID: vsock.ContextID, + VHostFD: vsock.VhostFd, DisableModern: false, DevNo: devno, },