diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4b8e0e3c10698bb71f27ab24c2fe38374c16c13e..f495a0900b331d186fe29b0830c8d4b746cc498b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2037,7 +2037,7 @@ virDomainVcpuPinDefCopy(virDomainPinDefPtr *src, int nvcpupin) } void -virDomainVcpuPinDefFree(virDomainPinDefPtr def) +virDomainPinDefFree(virDomainPinDefPtr def) { if (def) { virBitmapFree(def->cpumask); @@ -2055,7 +2055,7 @@ virDomainVcpuPinDefArrayFree(virDomainPinDefPtr *def, return; for (i = 0; i < nvcpupin; i++) - virDomainVcpuPinDefFree(def[i]); + virDomainPinDefFree(def[i]); VIR_FREE(def); } @@ -2231,7 +2231,7 @@ void virDomainDefFree(virDomainDefPtr def) virDomainVcpuPinDefArrayFree(def->cputune.vcpupin, def->cputune.nvcpupin); - virDomainVcpuPinDefFree(def->cputune.emulatorpin); + virDomainPinDefFree(def->cputune.emulatorpin); virDomainVcpuPinDefArrayFree(def->cputune.iothreadspin, def->cputune.niothreadspin); @@ -13534,7 +13534,7 @@ virDomainDefParseXML(xmlDocPtr xml, vcpupin->id)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("duplicate vcpupin for same vcpu")); - virDomainVcpuPinDefFree(vcpupin); + virDomainPinDefFree(vcpupin); goto error; } @@ -13545,7 +13545,7 @@ virDomainDefParseXML(xmlDocPtr xml, * ignoring them instead. */ VIR_WARN("Ignore vcpupin for not onlined vcpus"); - virDomainVcpuPinDefFree(vcpupin); + virDomainPinDefFree(vcpupin); } else { def->cputune.vcpupin[def->cputune.nvcpupin++] = vcpupin; } @@ -13626,7 +13626,7 @@ virDomainDefParseXML(xmlDocPtr xml, iothreadpin->id)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("duplicate iothreadpin for same iothread")); - virDomainVcpuPinDefFree(iothreadpin); + virDomainPinDefFree(iothreadpin); goto error; } @@ -16812,7 +16812,7 @@ virDomainVcpuPinAdd(virDomainPinDefPtr **vcpupin_list, return 0; error: - virDomainVcpuPinDefFree(vcpupin); + virDomainPinDefFree(vcpupin); return -1; } @@ -16847,7 +16847,7 @@ virDomainEmulatorPinAdd(virDomainDefPtr def, emulatorpin->id = -1; emulatorpin->cpumask = virBitmapNewData(cpumap, maplen); if (!emulatorpin->cpumask) { - virDomainVcpuPinDefFree(emulatorpin); + virDomainPinDefFree(emulatorpin); return -1; } @@ -16871,7 +16871,7 @@ virDomainEmulatorPinDel(virDomainDefPtr def) if (!def->cputune.emulatorpin) return 0; - virDomainVcpuPinDefFree(def->cputune.emulatorpin); + virDomainPinDefFree(def->cputune.emulatorpin); def->cputune.emulatorpin = NULL; return 0; @@ -16918,7 +16918,7 @@ virDomainIOThreadsPinAdd(virDomainPinDefPtr **iothreadspin_list, return 0; error: - virDomainVcpuPinDefFree(iothreadpin); + virDomainPinDefFree(iothreadpin); return -1; } diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 12ac2c023651036e476659da93624a8353940cf9..57c36c11b563f121751272671ed8a0329cf901de 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1907,7 +1907,7 @@ struct _virDomainPinDef { virBitmapPtr cpumask; }; -void virDomainVcpuPinDefFree(virDomainPinDefPtr def); +void virDomainPinDefFree(virDomainPinDefPtr def); void virDomainVcpuPinDefArrayFree(virDomainPinDefPtr *def, int nvcpupin); virDomainPinDefPtr *virDomainVcpuPinDefCopy(virDomainPinDefPtr *src, diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ea3ffb0a7922f6a087d13d1aa73f5e3d7e0c7706..14cf3c7d87ba4a52a5516d10350b778c79c51309 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -384,6 +384,7 @@ virDomainObjTaint; virDomainParseMemory; virDomainPausedReasonTypeFromString; virDomainPausedReasonTypeToString; +virDomainPinDefFree; virDomainPMSuspendedReasonTypeFromString; virDomainPMSuspendedReasonTypeToString; virDomainRedirdevBusTypeFromString; @@ -438,7 +439,6 @@ virDomainTPMModelTypeToString; virDomainVcpuPinAdd; virDomainVcpuPinDefArrayFree; virDomainVcpuPinDefCopy; -virDomainVcpuPinDefFree; virDomainVcpuPinDel; virDomainVcpuPinFindByVcpu; virDomainVcpuPinIsDuplicate; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index e56258f16e02fd18f7d3ddb7b4e280094e6b769d..4b644f7df2a982f2895476619867e7c8a47b8c05 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -5438,7 +5438,7 @@ qemuDomainPinEmulator(virDomainPtr dom, goto endjob; } } else { - virDomainVcpuPinDefFree(vm->def->cputune.emulatorpin); + virDomainPinDefFree(vm->def->cputune.emulatorpin); vm->def->cputune.emulatorpin = newVcpuPin[0]; VIR_FREE(newVcpuPin); }