From 895959d007422b50e53d25297814942c6c551c31 Mon Sep 17 00:00:00 2001
From: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
Date: Tue, 11 Aug 2020 16:34:19 +0000
Subject: [PATCH] clh: Provide cpu topology to API

[ Port from runtime commit 39897867bc89667daaafdd141367ec4a5fdc9247 ]

API now requires cpu topology.

Fixes: #461

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
Signed-off-by: Bo Chen <chen.bo@intel.com>
---
 src/runtime/virtcontainers/clh.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/runtime/virtcontainers/clh.go b/src/runtime/virtcontainers/clh.go
index 4e4b105d42..4e8ae627b2 100644
--- a/src/runtime/virtcontainers/clh.go
+++ b/src/runtime/virtcontainers/clh.go
@@ -296,6 +296,12 @@ func (clh *cloudHypervisor) createSandbox(ctx context.Context, id string, networ
 		Mode: cctOFF,
 	}
 
+	clh.vmconfig.Cpus.Topology = chclient.CpuTopology{
+		ThreadsPerCore: 1,
+		CoresPerDie:    int32(clh.config.DefaultMaxVCPUs),
+		DiesPerPackage: 1,
+		Packages:       1,
+	}
 	// Overwrite the default value of HTTP API socket path for cloud hypervisor
 	apiSocketPath, err := clh.apiSocketPath(id)
 	if err != nil {