diff options
author | Daniel P. Berrangé <berrange@redhat.com> | 2021-10-29 10:08:03 +0100 |
---|---|---|
committer | Cole Robinson <crobinso@redhat.com> | 2022-01-20 14:16:38 -0500 |
commit | 7b68fe1a5e17de3b48efb1b58d6aa4bf4cf9f6dc (patch) | |
tree | 037f8513cf5f82c078fdc3259f888ecbdf27178e | |
parent | 95eb8dda9b3bf899090c92a793c28d2b0993fc4f (diff) | |
download | virt-manager-7b68fe1a5e17de3b48efb1b58d6aa4bf4cf9f6dc.tar.gz |
virtinst: take account of 'dies' when calc vcpu count from topology
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-rw-r--r-- | tests/test_misc.py | 6 | ||||
-rw-r--r-- | virtinst/domain/cpu.py | 1 |
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)) |