opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3594 from wanyaoqi/feature/wyq/arm-virtualization

Browse Source 
host arm support
This commit is contained in:
yunion-ci-robot
2019-11-18 14:09:23 +08:00
committed by GitHub
parent 80bc2d0994 db4de4f7d7
commit c50d3e8958
12 changed files with 425 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/sysutils/sysutils.go
+10 -6
View File
@@ -105,13 +105,13 @@ func ParseCPUInfo(lines []string) (*types.SCPUInfo, error) {
}
}
if len(model) == 0 {
return nil, fmt.Errorf("Not found model name")
log.Errorf("Failed to get cpu model")
}
if len(freq) == 0 {
return nil, fmt.Errorf("Not found cpu MHz")
log.Errorf("Failed to get cpu MHz")
}
if len(cache) == 0 {
return nil, fmt.Errorf("Not found cache size")
log.Errorf("Failed to get cpu cache size")
}
model = strings.TrimSpace(model)
info := &types.SCPUInfo{
@@ -119,9 +119,13 @@ func ParseCPUInfo(lines []string) (*types.SCPUInfo, error) {
Model: model,
Microcode: microcode,
}
info.Cache, _ = strconv.Atoi(cache)
freqF, _ := strconv.ParseFloat(freq, 32)
info.Freq = int(freqF)
if len(cache) > 0 {
info.Cache, _ = strconv.Atoi(cache)
}
if len(freq) > 0 {
freqF, _ := strconv.ParseFloat(freq, 32)
info.Freq = int(freqF)
}
return info, nil
}