From 77b0dfb05f8a05a2c1083002134a742d45de81dd Mon Sep 17 00:00:00 2001 From: Julio Montes Date: Mon, 11 Nov 2019 22:19:57 +0000 Subject: [PATCH] virtcontainers: use new firecracker API Support new firecracker API 0.19.0: * remove vsock ID from http request fixes #2183 Signed-off-by: Julio Montes --- virtcontainers/fc.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/virtcontainers/fc.go b/virtcontainers/fc.go index c92e63e6cc..fb2e32acab 100644 --- a/virtcontainers/fc.go +++ b/virtcontainers/fc.go @@ -299,7 +299,7 @@ func (fc *firecracker) vmRunning() bool { return false case models.InstanceInfoStateRunning: return true - case models.InstanceInfoStateUninitialized, models.InstanceInfoStateHalting, models.InstanceInfoStateHalted: + case models.InstanceInfoStateUninitialized: return false default: return false @@ -784,7 +784,7 @@ func (fc *firecracker) fcAddVsock(hvs types.HybridVSock) error { udsPath = filepath.Join("/", defaultHybridVSocketName) } - vsockParams := ops.NewPutGuestVsockByIDParams() + vsockParams := ops.NewPutGuestVsockParams() vsockID := "root" ctxID := defaultGuestVSockCID vsock := &models.Vsock{ @@ -792,10 +792,9 @@ func (fc *firecracker) fcAddVsock(hvs types.HybridVSock) error { UdsPath: &udsPath, VsockID: &vsockID, } - vsockParams.SetID(vsockID) vsockParams.SetBody(vsock) - _, err := fc.client().Operations.PutGuestVsockByID(vsockParams) + _, err := fc.client().Operations.PutGuestVsock(vsockParams) if err != nil { return err }