Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Commit

Permalink
clh: remove not requried values
Browse files Browse the repository at this point in the history
- 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>
  • Loading branch information
jcvenegas committed Dec 13, 2019
1 parent e9a852d commit 9c3151e
Showing 1 changed file with 3 additions and 14 deletions.
17 changes: 3 additions & 14 deletions virtcontainers/clh.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,6 @@ const (
// Values are mandatory by http API
// Values based on:
// github.com/cloud-hypervisor/cloud-hypervisor/blob/v0.3.0/vmm/src/config.rs#L395
clhFsQueues = 1
clhFsQueueSize = 1024
clhTimeout = 10
clhAPITimeout = 1
clhStopSandboxTimeout = 3
Expand Down Expand Up @@ -1042,12 +1040,7 @@ func (clh *cloudHypervisor) addNet(e Endpoint) {
"tap": tapPath,
}).Info("Adding Net")

// FIXME: This is required by CH
// 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})
clh.vmconfig.Net = append(clh.vmconfig.Net, chclient.NetConfig{Mac: mac, Tap: tapPath})
}

// Add shared Volume using virtiofs
Expand All @@ -1067,17 +1060,13 @@ func (clh *cloudHypervisor) addVolume(volume types.Volume) error {
Tag: volume.MountTag,
CacheSize: int64(clh.config.VirtioFSCacheSize << 20),
Sock: vfsdSockPath,
NumQueues: clhFsQueues,
QueueSize: clhFsQueueSize,
},
}
} else {
clh.vmconfig.Fs = []chclient.FsConfig{
{
Tag: volume.MountTag,
Sock: vfsdSockPath,
NumQueues: clhFsQueues,
QueueSize: clhFsQueueSize,
Tag: volume.MountTag,
Sock: vfsdSockPath,
},
}

Expand Down

0 comments on commit 9c3151e

Please sign in to comment.