diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 3fb8ea886357f85cd76d8fa6dacc32e4ecfd9510..c01b8952a057d6896a20a72279ced6e865a08e60 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2004,15 +2004,15 @@ virDomainClockDefClear(virDomainClockDefPtr def) } virDomainPinDefPtr * -virDomainVcpuPinDefCopy(virDomainPinDefPtr *src, int nvcpupin) +virDomainPinDefCopy(virDomainPinDefPtr *src, int npin) { size_t i; virDomainPinDefPtr *ret = NULL; - if (VIR_ALLOC_N(ret, nvcpupin) < 0) + if (VIR_ALLOC_N(ret, npin) < 0) goto error; - for (i = 0; i < nvcpupin; i++) { + for (i = 0; i < npin; i++) { if (VIR_ALLOC(ret[i]) < 0) goto error; ret[i]->id = src[i]->id; @@ -2024,7 +2024,7 @@ virDomainVcpuPinDefCopy(virDomainPinDefPtr *src, int nvcpupin) error: if (ret) { - for (i = 0; i < nvcpupin; i++) { + for (i = 0; i < npin; i++) { if (ret[i]) { virBitmapFree(ret[i]->cpumask); VIR_FREE(ret[i]); diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 341be5f01ee8e615d5e1cd0f044086ad724ba4d4..f991927f95fc44c460f817eca8e194680e8dd971 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1910,8 +1910,8 @@ struct _virDomainPinDef { void virDomainPinDefFree(virDomainPinDefPtr def); void virDomainPinDefArrayFree(virDomainPinDefPtr *def, int npin); -virDomainPinDefPtr *virDomainVcpuPinDefCopy(virDomainPinDefPtr *src, - int nvcpupin); +virDomainPinDefPtr *virDomainPinDefCopy(virDomainPinDefPtr *src, + int npin); int virDomainVcpuPinIsDuplicate(virDomainPinDefPtr *def, int nvcpupin, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index cbc3aea972ac759f3a53a2ccf6ac3a60f9e65da9..ed1862903828737583ab4526e4ca6f80b6db4248 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -385,6 +385,7 @@ virDomainParseMemory; virDomainPausedReasonTypeFromString; virDomainPausedReasonTypeToString; virDomainPinDefArrayFree; +virDomainPinDefCopy; virDomainPinDefFree; virDomainPMSuspendedReasonTypeFromString; virDomainPMSuspendedReasonTypeToString; @@ -438,7 +439,6 @@ virDomainTPMDefFree; virDomainTPMModelTypeFromString; virDomainTPMModelTypeToString; virDomainVcpuPinAdd; -virDomainVcpuPinDefCopy; virDomainVcpuPinDel; virDomainVcpuPinFindByVcpu; virDomainVcpuPinIsDuplicate; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index d20118703af962b9d9060608ebf35626d8dda0fb..66ef95fbc2b21c04a4106b8fef008da94571fa3e 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5111,8 +5111,8 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, } if (vm->def->cputune.vcpupin) { - newVcpuPin = virDomainVcpuPinDefCopy(vm->def->cputune.vcpupin, - vm->def->cputune.nvcpupin); + newVcpuPin = virDomainPinDefCopy(vm->def->cputune.vcpupin, + vm->def->cputune.nvcpupin); if (!newVcpuPin) goto endjob; @@ -5984,10 +5984,9 @@ qemuDomainPinIOThread(virDomainPtr dom, } if (vm->def->cputune.iothreadspin) { - /* The VcpuPinDefCopy works for IOThreads too */ newIOThreadsPin = - virDomainVcpuPinDefCopy(vm->def->cputune.iothreadspin, - vm->def->cputune.niothreadspin); + virDomainPinDefCopy(vm->def->cputune.iothreadspin, + vm->def->cputune.niothreadspin); if (!newIOThreadsPin) goto endjob;