NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Simplify qemuDomainGetEmulatorPinInfo by using virDomainObjGetOneDef

Browse Source 
virDomainObjGetOneDef is simpler to use than virDomainObjGetDefs
This commit is contained in:
Peter Krempa 2015-06-15 19:10:49 +02:00
parent 2881c381a0
commit f3a7006545
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/qemu/qemu_driver.c
View File

@ -5400,7 +5400,6 @@ qemuDomainGetEmulatorPinInfo(virDomainPtr dom,
{ {
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
virDomainDefPtr def; virDomainDefPtr def;
virDomainDefPtr targetDef;
int ret = -1; int ret = -1;
int hostcpus; int hostcpus;
virBitmapPtr cpumask = NULL; virBitmapPtr cpumask = NULL;
@ -5415,19 +5414,16 @@ qemuDomainGetEmulatorPinInfo(virDomainPtr dom,
if (virDomainGetEmulatorPinInfoEnsureACL(dom->conn, vm->def) < 0) if (virDomainGetEmulatorPinInfoEnsureACL(dom->conn, vm->def) < 0)
goto cleanup; goto cleanup;
if (virDomainObjGetDefs(vm, flags, &def, &targetDef) < 0) if (!(def = virDomainObjGetOneDef(vm, flags)))
goto cleanup; goto cleanup;
if (def)
targetDef = def;
if ((hostcpus = nodeGetCPUCount()) < 0) if ((hostcpus = nodeGetCPUCount()) < 0)
goto cleanup; goto cleanup;
if (targetDef->cputune.emulatorpin) { if (def->cputune.emulatorpin) {
cpumask = targetDef->cputune.emulatorpin; cpumask = def->cputune.emulatorpin;
} else if (targetDef->cpumask) { } else if (def->cpumask) {
cpumask = targetDef->cpumask; cpumask = def->cpumask;
} else { } else {
if (!(bitmap = virBitmapNew(hostcpus))) if (!(bitmap = virBitmapNew(hostcpus)))
goto cleanup; goto cleanup;