From 41a4e516bb9244656885e053a513836a67d2e2e9 Mon Sep 17 00:00:00 2001 From: Jose Carlos Venegas Munoz Date: Tue, 10 Dec 2019 07:18:50 +0000 Subject: [PATCH] clh: remove not requried values - ip and mask are not needed anymore. - fs queues are set by cloud-hypervisor Signed-off-by: Jose Carlos Venegas Munoz --- virtcontainers/clh.go | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/virtcontainers/clh.go b/virtcontainers/clh.go index 8bf8a4b426..3e11da9217 100644 --- a/virtcontainers/clh.go +++ b/virtcontainers/clh.go @@ -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 @@ -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 @@ -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, }, }