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

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
Download Patch File Download Diff File Expand all files Collapse all files

20
src/conf/domain_conf.c
View File

@@ -2037,7 +2037,7 @@ virDomainVcpuPinDefCopy(virDomainPinDefPtr *src, int nvcpupin)
} }
void void
virDomainVcpuPinDefFree(virDomainPinDefPtr def) virDomainPinDefFree(virDomainPinDefPtr def)
{ {
if (def) { if (def) {
virBitmapFree(def->cpumask); virBitmapFree(def->cpumask);
@@ -2055,7 +2055,7 @@ virDomainVcpuPinDefArrayFree(virDomainPinDefPtr *def,
return; return;
for (i = 0; i < nvcpupin; i++) for (i = 0; i < nvcpupin; i++)
virDomainVcpuPinDefFree(def[i]); virDomainPinDefFree(def[i]);
VIR_FREE(def); VIR_FREE(def);
} }
@@ -2231,7 +2231,7 @@ void virDomainDefFree(virDomainDefPtr def)
virDomainVcpuPinDefArrayFree(def->cputune.vcpupin, def->cputune.nvcpupin); virDomainVcpuPinDefArrayFree(def->cputune.vcpupin, def->cputune.nvcpupin);
virDomainVcpuPinDefFree(def->cputune.emulatorpin); virDomainPinDefFree(def->cputune.emulatorpin);
virDomainVcpuPinDefArrayFree(def->cputune.iothreadspin, virDomainVcpuPinDefArrayFree(def->cputune.iothreadspin,
def->cputune.niothreadspin); def->cputune.niothreadspin);
@@ -13534,7 +13534,7 @@ virDomainDefParseXML(xmlDocPtr xml,
vcpupin->id)) { vcpupin->id)) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("duplicate vcpupin for same vcpu")); "%s", _("duplicate vcpupin for same vcpu"));
virDomainVcpuPinDefFree(vcpupin); virDomainPinDefFree(vcpupin);
goto error; goto error;
} }
@@ -13545,7 +13545,7 @@ virDomainDefParseXML(xmlDocPtr xml,
* ignoring them instead. * ignoring them instead.
*/ */
VIR_WARN("Ignore vcpupin for not onlined vcpus"); VIR_WARN("Ignore vcpupin for not onlined vcpus");
virDomainVcpuPinDefFree(vcpupin); virDomainPinDefFree(vcpupin);
} else { } else {
def->cputune.vcpupin[def->cputune.nvcpupin++] = vcpupin; def->cputune.vcpupin[def->cputune.nvcpupin++] = vcpupin;
} }
@@ -13626,7 +13626,7 @@ virDomainDefParseXML(xmlDocPtr xml,
iothreadpin->id)) { iothreadpin->id)) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("duplicate iothreadpin for same iothread")); _("duplicate iothreadpin for same iothread"));
virDomainVcpuPinDefFree(iothreadpin); virDomainPinDefFree(iothreadpin);
goto error; goto error;
} }
@@ -16812,7 +16812,7 @@ virDomainVcpuPinAdd(virDomainPinDefPtr **vcpupin_list,
return 0; return 0;
error: error:
virDomainVcpuPinDefFree(vcpupin); virDomainPinDefFree(vcpupin);
return -1; return -1;
} }
@@ -16847,7 +16847,7 @@ virDomainEmulatorPinAdd(virDomainDefPtr def,
emulatorpin->id = -1; emulatorpin->id = -1;
emulatorpin->cpumask = virBitmapNewData(cpumap, maplen); emulatorpin->cpumask = virBitmapNewData(cpumap, maplen);
if (!emulatorpin->cpumask) { if (!emulatorpin->cpumask) {
virDomainVcpuPinDefFree(emulatorpin); virDomainPinDefFree(emulatorpin);
return -1; return -1;
} }
@@ -16871,7 +16871,7 @@ virDomainEmulatorPinDel(virDomainDefPtr def)
if (!def->cputune.emulatorpin) if (!def->cputune.emulatorpin)
return 0; return 0;
virDomainVcpuPinDefFree(def->cputune.emulatorpin); virDomainPinDefFree(def->cputune.emulatorpin);
def->cputune.emulatorpin = NULL; def->cputune.emulatorpin = NULL;
return 0; return 0;
@@ -16918,7 +16918,7 @@ virDomainIOThreadsPinAdd(virDomainPinDefPtr **iothreadspin_list,
return 0; return 0;
error: error:
virDomainVcpuPinDefFree(iothreadpin); virDomainPinDefFree(iothreadpin);
return -1; return -1;
} }

2
src/conf/domain_conf.h
View File

@@ -1907,7 +1907,7 @@ struct _virDomainPinDef {
virBitmapPtr cpumask; virBitmapPtr cpumask;
}; };
void virDomainVcpuPinDefFree(virDomainPinDefPtr def); void virDomainPinDefFree(virDomainPinDefPtr def);
void virDomainVcpuPinDefArrayFree(virDomainPinDefPtr *def, int nvcpupin); void virDomainVcpuPinDefArrayFree(virDomainPinDefPtr *def, int nvcpupin);
virDomainPinDefPtr *virDomainVcpuPinDefCopy(virDomainPinDefPtr *src, virDomainPinDefPtr *virDomainVcpuPinDefCopy(virDomainPinDefPtr *src,

2
src/libvirt_private.syms
View File

@@ -384,6 +384,7 @@ virDomainObjTaint;
virDomainParseMemory; virDomainParseMemory;
virDomainPausedReasonTypeFromString; virDomainPausedReasonTypeFromString;
virDomainPausedReasonTypeToString; virDomainPausedReasonTypeToString;
virDomainPinDefFree;
virDomainPMSuspendedReasonTypeFromString; virDomainPMSuspendedReasonTypeFromString;
virDomainPMSuspendedReasonTypeToString; virDomainPMSuspendedReasonTypeToString;
virDomainRedirdevBusTypeFromString; virDomainRedirdevBusTypeFromString;
@@ -438,7 +439,6 @@ virDomainTPMModelTypeToString;
virDomainVcpuPinAdd; virDomainVcpuPinAdd;
virDomainVcpuPinDefArrayFree; virDomainVcpuPinDefArrayFree;
virDomainVcpuPinDefCopy; virDomainVcpuPinDefCopy;
virDomainVcpuPinDefFree;
virDomainVcpuPinDel; virDomainVcpuPinDel;
virDomainVcpuPinFindByVcpu; virDomainVcpuPinFindByVcpu;
virDomainVcpuPinIsDuplicate; virDomainVcpuPinIsDuplicate;

2
src/qemu/qemu_driver.c
View File

@@ -5438,7 +5438,7 @@ qemuDomainPinEmulator(virDomainPtr dom,
goto endjob; goto endjob;
} }
} else { } else {
virDomainVcpuPinDefFree(vm->def->cputune.emulatorpin); virDomainPinDefFree(vm->def->cputune.emulatorpin);
vm->def->cputune.emulatorpin = newVcpuPin[0]; vm->def->cputune.emulatorpin = newVcpuPin[0];
VIR_FREE(newVcpuPin); VIR_FREE(newVcpuPin);
} }