External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-09-09 17:24:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: parse: Assign topology info earlier

Browse Source 
Qemu can also use the topology to calculate the total vcpu count. To
allow parsing this move the assignment earlier.
This commit is contained in:
Peter Krempa 2016-11-14 14:49:57 +01:00
parent d78a8c26c2
commit 0d9a76de6d
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/qemu/qemu_parse_command.c
View File

@ -1701,18 +1701,6 @@ qemuParseCommandLineSmp(virDomainDefPtr dom,
}
}
if (maxcpus == 0)
maxcpus = vcpus;
if (maxcpus == 0)
goto syntax;
if (virDomainDefSetVcpusMax(dom, maxcpus, xmlopt) < 0)
goto error;
if (virDomainDefSetVcpus(dom, vcpus) < 0)
goto error;
if (sockets && cores && threads) {
virCPUDefPtr cpu;
@ -1725,6 +1713,18 @@ qemuParseCommandLineSmp(virDomainDefPtr dom,
goto syntax;
}
if (maxcpus == 0)
maxcpus = vcpus;
if (maxcpus == 0)
goto syntax;
if (virDomainDefSetVcpusMax(dom, maxcpus, xmlopt) < 0)
goto error;
if (virDomainDefSetVcpus(dom, vcpus) < 0)
goto error;
ret = 0;
cleanup: