Merge pull request #2529 from likebreath/clh_remove_deadcode

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

View File

@ -62,7 +62,6 @@ const (
supportedMinorVersion = 5
defaultClhPath = "/usr/local/bin/cloud-hypervisor"
virtioFsCacheAlways = "always"
maxClhVcpus = uint32(64)
)
// 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
}
// MaxClhVCPUs returns the maximum number of vCPUs supported
func MaxClhVCPUs() uint32 {
return maxClhVcpus
}
//###########################################################################
//
// Cloud-hypervisor CLI builder

View File

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