From a1874ccd62508f3a6a4e18a6b61030b5536d61f3 Mon Sep 17 00:00:00 2001 From: Bo Chen Date: Thu, 9 Sep 2021 14:49:07 -0700 Subject: [PATCH] virtcontainers: clh: Revert the workaround incorrect default values Given the fix to the bugs of the openapi spec file is included in the Cloud Hypervisor v18.0 [1], this patch reverts the workaround we carried in the CLH driver. This reverts commit 932ee41b3f18fe9036a5faa64c154fe6a39dc739. [1] https://github.com/cloud-hypervisor/cloud-hypervisor/pull/3029 Signed-off-by: Bo Chen (cherry picked from commit f785ff0bf21425d952a1acad8b1f72c859ad9396) --- src/runtime/virtcontainers/clh.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/runtime/virtcontainers/clh.go b/src/runtime/virtcontainers/clh.go index e7afc097d5..630054f85f 100644 --- a/src/runtime/virtcontainers/clh.go +++ b/src/runtime/virtcontainers/clh.go @@ -243,7 +243,6 @@ func (clh *cloudHypervisor) createSandbox(ctx context.Context, id string, networ clh.vmconfig.Memory = chclient.NewMemoryConfig(int64((utils.MemUnit(clh.config.MemorySize) * utils.MiB).ToBytes())) // shared memory should be enabled if using vhost-user(kata uses virtiofsd) clh.vmconfig.Memory.Shared = func(b bool) *bool { return &b }(true) - clh.vmconfig.Memory.HotplugMethod = func(s string) *string { return &s }("Acpi") hostMemKb, err := getHostMemorySizeKb(procMemInfo) if err != nil { return nil @@ -1123,7 +1122,6 @@ func (clh *cloudHypervisor) addNet(e Endpoint) error { net := chclient.NewNetConfig() net.Mac = &mac net.Tap = &tapPath - net.VhostMode = func(s string) *string { return &s }("Client") if clh.vmconfig.Net != nil { *clh.vmconfig.Net = append(*clh.vmconfig.Net, *net) } else {