External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

Convert virDomainVcpuPinDefFree to virDomainPinDefFree

Browse Source 
Since both Vcpu and IOThreads code use the same API's, alter the naming
of the API's to remove the "Vcpu" specific reference
This commit is contained in:
John Ferlan 2015-03-10 20:15:45 -04:00
parent a9f528ab29
commit 0a06a1812d
4 changed files with 13 additions and 13 deletions

20
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;
}

2
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,

2
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;

2
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);
}