virtinst: take account of 'dies' when calc vcpu count from topology

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

2 files changed, 7 insertions, 0 deletions

diff --git a/tests/test_misc.py b/tests/test_misc.py
index 2dced1e8..7a56e134 100644
--- a/tests/test_misc.py
+++ b/tests/test_misc.py
@@ -48,6 +48,12 @@ def test_misc_cpu_topology():
     assert cpu.vcpus_from_topology() == 10
 
     cpu = virtinst.DomainCpu(conn)
+    cpu.topology.sockets = 3
+    cpu.topology.dies = 2
+    cpu.topology.cores = 2
+    assert cpu.vcpus_from_topology() == 12
+
+    cpu = virtinst.DomainCpu(conn)
     assert cpu.vcpus_from_topology() == 1
 
 
diff --git a/virtinst/domain/cpu.py b/virtinst/domain/cpu.py
index b7ca764c..dfc8bb43 100644
--- a/virtinst/domain/cpu.py
+++ b/virtinst/domain/cpu.py
@@ -365,6 +365,7 @@ class DomainCpu(XMLBuilder):
         no topology is set
         """
         return ((self.topology.sockets or 1) *
+                (self.topology.dies or 1) *
                 (self.topology.cores or 1) *
                 (self.topology.threads or 1))