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

Merge pull request #2529 from likebreath/clh_remove_deadcode

Browse Source 
clh: Remove dead-code on maxClhVcpus
This commit is contained in:
Archana Shinde 2020-03-16 11:07:10 -07:00 committed by GitHub
commit aaa4e5c661
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
virtcontainers/clh.go
View File

@ -62,7 +62,6 @@ const (
supportedMinorVersion = 5 supportedMinorVersion = 5
defaultClhPath = "/usr/local/bin/cloud-hypervisor" defaultClhPath = "/usr/local/bin/cloud-hypervisor"
virtioFsCacheAlways = "always" virtioFsCacheAlways = "always"
maxClhVcpus = uint32(64)
) )
// Interface that hides the implementation of openAPI client // Interface that hides the implementation of openAPI client
@ -795,11 +794,6 @@ func (clh *cloudHypervisor) LaunchClh() (string, int, error) {
return errStr, cmd.Process.Pid, nil return errStr, cmd.Process.Pid, nil
} }
// MaxClhVCPUs returns the maximum number of vCPUs supported
func MaxClhVCPUs() uint32 {
return maxClhVcpus
}
//########################################################################### //###########################################################################
// //
// Cloud-hypervisor CLI builder // Cloud-hypervisor CLI builder

2
virtcontainers/clh_test.go
View File

@ -47,7 +47,7 @@ func newClhConfig() (HypervisorConfig, error) {
BlockDeviceDriver: config.VirtioBlock, BlockDeviceDriver: config.VirtioBlock,
MemorySize: defaultMemSzMiB, MemorySize: defaultMemSzMiB,
DefaultBridges: defaultBridges, DefaultBridges: defaultBridges,
DefaultMaxVCPUs: MaxClhVCPUs(), DefaultMaxVCPUs: uint32(64),
SharedFS: config.VirtioFS, SharedFS: config.VirtioFS,
VirtioFSCache: virtioFsCacheAlways, VirtioFSCache: virtioFsCacheAlways,
VirtioFSDaemon: testVirtiofsdPath, VirtioFSDaemon: testVirtiofsdPath,