github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-25 06:52:13 +00:00
Code Issues Projects Releases Wiki Activity

clh: remove not requried values

Browse Source 
- ip and mask are not needed anymore.
- fs queues are set by cloud-hypervisor.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
This commit is contained in:
Jose Carlos Venegas Munoz 2019-12-10 07:18:50 +00:00
parent e9a852dd79
commit 9c3151e5ed
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
virtcontainers/clh.go
View File

@ -48,8 +48,6 @@ const (
// Values are mandatory by http API // Values are mandatory by http API
// Values based on: // Values based on:
// github.com/cloud-hypervisor/cloud-hypervisor/blob/v0.3.0/vmm/src/config.rs#L395 // github.com/cloud-hypervisor/cloud-hypervisor/blob/v0.3.0/vmm/src/config.rs#L395
clhFsQueues = 1
clhFsQueueSize = 1024
clhTimeout = 10 clhTimeout = 10
clhAPITimeout = 1 clhAPITimeout = 1
clhStopSandboxTimeout = 3 clhStopSandboxTimeout = 3
@ -1042,12 +1040,7 @@ func (clh *cloudHypervisor) addNet(e Endpoint) {
"tap": tapPath, "tap": tapPath,
}).Info("Adding Net") }).Info("Adding Net")
// FIXME: This is required by CH clh.vmconfig.Net = append(clh.vmconfig.Net, chclient.NetConfig{Mac: mac, Tap: tapPath})
// remove after PR is merged:
// https://github.com/cloud-hypervisor/cloud-hypervisor/pull/480
ip := "0.0.0.0"
mask := "0.0.0.0"
clh.vmconfig.Net = append(clh.vmconfig.Net, chclient.NetConfig{Mac: mac, Tap: tapPath, Ip: ip, Mask: mask})
} }
// Add shared Volume using virtiofs // Add shared Volume using virtiofs
@ -1067,17 +1060,13 @@ func (clh *cloudHypervisor) addVolume(volume types.Volume) error {
Tag: volume.MountTag, Tag: volume.MountTag,
CacheSize: int64(clh.config.VirtioFSCacheSize << 20), CacheSize: int64(clh.config.VirtioFSCacheSize << 20),
Sock: vfsdSockPath, Sock: vfsdSockPath,
NumQueues: clhFsQueues,
QueueSize: clhFsQueueSize,
}, },
} }
} else { } else {
clh.vmconfig.Fs = []chclient.FsConfig{ clh.vmconfig.Fs = []chclient.FsConfig{
{ {
Tag: volume.MountTag, Tag: volume.MountTag,
Sock: vfsdSockPath, Sock: vfsdSockPath,
NumQueues: clhFsQueues,
QueueSize: clhFsQueueSize,
}, },
} }