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

virtcontainers: use new firecracker API

Browse Source 
Support new firecracker API 0.19.0:
* remove vsock ID from http request

fixes #2183

Signed-off-by: Julio Montes <julio.montes@intel.com>
This commit is contained in:
Julio Montes 2019-11-11 22:19:57 +00:00
parent 0def9b01de
commit 77b0dfb05f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
virtcontainers/fc.go
View File

@ -299,7 +299,7 @@ func (fc *firecracker) vmRunning() bool {
return false return false
case models.InstanceInfoStateRunning: case models.InstanceInfoStateRunning:
return true return true
case models.InstanceInfoStateUninitialized, models.InstanceInfoStateHalting, models.InstanceInfoStateHalted: case models.InstanceInfoStateUninitialized:
return false return false
default: default:
return false return false
@ -784,7 +784,7 @@ func (fc *firecracker) fcAddVsock(hvs types.HybridVSock) error {
udsPath = filepath.Join("/", defaultHybridVSocketName) udsPath = filepath.Join("/", defaultHybridVSocketName)
} }
vsockParams := ops.NewPutGuestVsockByIDParams() vsockParams := ops.NewPutGuestVsockParams()
vsockID := "root" vsockID := "root"
ctxID := defaultGuestVSockCID ctxID := defaultGuestVSockCID
vsock := &models.Vsock{ vsock := &models.Vsock{
@ -792,10 +792,9 @@ func (fc *firecracker) fcAddVsock(hvs types.HybridVSock) error {
UdsPath: &udsPath, UdsPath: &udsPath,
VsockID: &vsockID, VsockID: &vsockID,
} }
vsockParams.SetID(vsockID)
vsockParams.SetBody(vsock) vsockParams.SetBody(vsock)
_, err := fc.client().Operations.PutGuestVsockByID(vsockParams) _, err := fc.client().Operations.PutGuestVsock(vsockParams)
if err != nil { if err != nil {
return err return err
} }