openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu: Simplify qemuDomainGetVcpuPinInfo by using virDomainObjGetOneDef 

virDomainObjGetOneDef is simpler to use than virDomainObjGetDefs
This commit is contained in:
Peter Krempa 2015-06-15 19:10:49 +02:00
parent 3f0fe2dcb2
commit 2881c381a0
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

@ -5213,7 +5213,6 @@ qemuDomainGetVcpuPinInfo(virDomainPtr dom,
{ {
virDomainObjPtr vm = NULL; virDomainObjPtr vm = NULL;
virDomainDefPtr def; virDomainDefPtr def;
virDomainDefPtr targetDef;
int ret = -1; int ret = -1;
int hostcpus, vcpu; int hostcpus, vcpu;
virBitmapPtr allcpumap = NULL; virBitmapPtr allcpumap = NULL;
@ -5227,12 +5226,9 @@ qemuDomainGetVcpuPinInfo(virDomainPtr dom,
if (virDomainGetVcpuPinInfoEnsureACL(dom->conn, vm->def) < 0) if (virDomainGetVcpuPinInfoEnsureACL(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;
@ -5242,8 +5238,8 @@ qemuDomainGetVcpuPinInfo(virDomainPtr dom,
virBitmapSetAll(allcpumap); virBitmapSetAll(allcpumap);
/* Clamp to actual number of vcpus */ /* Clamp to actual number of vcpus */
if (ncpumaps > targetDef->vcpus) if (ncpumaps > def->vcpus)
ncpumaps = targetDef->vcpus; ncpumaps = def->vcpus;
if (ncpumaps < 1) if (ncpumaps < 1)
goto cleanup; goto cleanup;
@ -5252,8 +5248,8 @@ qemuDomainGetVcpuPinInfo(virDomainPtr dom,
virDomainPinDefPtr pininfo; virDomainPinDefPtr pininfo;
virBitmapPtr bitmap = NULL; virBitmapPtr bitmap = NULL;
pininfo = virDomainPinFind(targetDef->cputune.vcpupin, pininfo = virDomainPinFind(def->cputune.vcpupin,
targetDef->cputune.nvcpupin, def->cputune.nvcpupin,
vcpu); vcpu);
if (pininfo && pininfo->cpumask) if (pininfo && pininfo->cpumask)