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

clh: update minimal supported version to check.

Browse Source 
Kata now uses v0.5.0 and is not compatible with old versions.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
This commit is contained in:
Jose Carlos Venegas Munoz 2020-02-20 20:08:45 +00:00
parent 20332298ab
commit 33459779c4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
virtcontainers/clh.go
View File

@ -59,7 +59,7 @@ const (
virtioFsSocket = "virtiofsd.sock"
clhSerial = "serial-tty.log"
supportedMajorVersion = 0
supportedMinorVersion = 3
supportedMinorVersion = 5
defaultClhPath = "/usr/local/bin/cloud-hypervisor"
virtioFsCacheAlways = "always"
maxClhVcpus = uint32(64)
@ -676,7 +676,6 @@ func (clh *cloudHypervisor) getAvailableVersion() error {
}
// Remove 'v' prefix if has one
clh.Logger().Error("DEBUG :", versionSplit[0])
versionSplit[0] = strings.TrimLeft(versionSplit[0], "v")
major, err := strconv.ParseUint(versionSplit[0], 10, 64)
if err != nil {
@ -689,11 +688,12 @@ func (clh *cloudHypervisor) getAvailableVersion() error {
}
revisionStr := strings.SplitN(versionSplit[2], "-", -1)
if len(revisionStr) < 1 {
return errors.Errorf("Failed parse clh revision %s", versionSplit[2])
// revision could have aditional commit information separated by '-'
revisionSplit := strings.SplitN(versionSplit[2], "-", -1)
if len(revisionSplit) < 1 {
return errors.Errorf("Failed parse cloud-hypervisor revision %s", versionSplit[2])
}
revision, err := strconv.ParseUint(revisionStr[0], 10, 64)
revision, err := strconv.ParseUint(revisionSplit[0], 10, 64)
if err != nil {
return err
}