From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Fri, 10 Mar 2017 14:20:10 +0000 (+0100)
Subject: allow exposing hyperthreading at guest using metadata topology=oneSocket:hyperthreading
X-Git-Tag: v2.0.0~40
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fopenvim.git;a=commitdiff_plain;h=f1799b0c762bac3e45ea366d920437260b2a9652

allow exposing hyperthreading at guest using metadata topology=oneSocket:hyperthreading

Change-Id: If924551bc588dd530699ea20c124ae9632388ef6
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
---

diff --git a/host_thread.py b/host_thread.py
index 97c57ba..d8bca2e 100644
--- a/host_thread.py
+++ b/host_thread.py
@@ -501,8 +501,12 @@ class host_thread(threading.Thread):
             self.tab()+'<apic/>' +\
             self.tab()+'<pae/>'+ \
             self.dec_tab() +'</features>'
-        if windows_os or topo=="oneSocket":
-            text += self.tab() + "<cpu mode='host-model'> <topology sockets='1' cores='%d' threads='1' /> </cpu>"% vcpus
+        if topo == "oneSocket:hyperthreading":
+            if vcpus % 2 != 0:
+                return -1, 'Cannot expose hyperthreading with an odd number of vcpus'
+            text += self.tab() + "<cpu mode='host-model'> <topology sockets='1' cores='%d' threads='2' /> </cpu>" % vcpus/2
+        elif windows_os or topo == "oneSocket":
+            text += self.tab() + "<cpu mode='host-model'> <topology sockets='1' cores='%d' threads='1' /> </cpu>" % vcpus
         else:
             text += self.tab() + "<cpu mode='host-model'></cpu>"
         text += self.tab() + "<clock offset='utc'/>" +\