Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

support firecracker 0.19.0 #2184

Merged
merged 4 commits into from
Nov 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ assets:
uscan-url: >-
https://github.com/firecracker-microvm/firecracker/tags
.*/v?(\d\S+)\.tar\.gz
version: "v0.18.0"
version: "v0.19.0"

nemu:
description: "Reduced-emulation VMM that uses KVM"
Expand Down
9 changes: 4 additions & 5 deletions virtcontainers/fc.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ const (
)

// Specify the minimum version of firecracker supported
var fcMinSupportedVersion = semver.MustParse("0.18.0")
var fcMinSupportedVersion = semver.MustParse("0.19.0")

var fcKernelParams = append(commonVirtioblkKernelRootParams, []Param{
// The boot source is the first partition of the first block device added
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -784,18 +784,17 @@ 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{
GuestCid: &ctxID,
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
}
Expand Down
4 changes: 2 additions & 2 deletions virtcontainers/pkg/firecracker/README
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ The code is generated via go-swagger
https://github.com/go-swagger/go-swagger#licensing

```
swagger generate model -f ./firecracker-experimental.yaml --model-package=client/models --client-package=client
swagger generate client -f ./firecracker-experimental.yaml --model-package=client/models --client-package=client
swagger generate model -f ./firecracker.yaml --model-package=client/models --client-package=client
swagger generate client -f ./firecracker.yaml --model-package=client/models --client-package=client
```

```
Expand Down
10 changes: 2 additions & 8 deletions virtcontainers/pkg/firecracker/client/models/instance_info.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading