External/libvirt
1
0
Fork 0
Code

Convert virDomainVcpuPinDefCopy into virDomainPinDefCopy

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:24:04 -04:00
parent 24b15ea90d
commit c16723f606
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/conf/domain_conf.c
View File

@ -2004,15 +2004,15 @@ virDomainClockDefClear(virDomainClockDefPtr def)
} }
virDomainPinDefPtr * virDomainPinDefPtr *
virDomainVcpuPinDefCopy(virDomainPinDefPtr *src, int nvcpupin) virDomainPinDefCopy(virDomainPinDefPtr *src, int npin)
{ {
size_t i; size_t i;
virDomainPinDefPtr *ret = NULL; virDomainPinDefPtr *ret = NULL;
if (VIR_ALLOC_N(ret, nvcpupin) < 0) if (VIR_ALLOC_N(ret, npin) < 0)
goto error; goto error;
for (i = 0; i < nvcpupin; i++) { for (i = 0; i < npin; i++) {
if (VIR_ALLOC(ret[i]) < 0) if (VIR_ALLOC(ret[i]) < 0)
goto error; goto error;
ret[i]->id = src[i]->id; ret[i]->id = src[i]->id;
@ -2024,7 +2024,7 @@ virDomainVcpuPinDefCopy(virDomainPinDefPtr *src, int nvcpupin)
error: error:
if (ret) { if (ret) {
for (i = 0; i < nvcpupin; i++) { for (i = 0; i < npin; i++) {
if (ret[i]) { if (ret[i]) {
virBitmapFree(ret[i]->cpumask); virBitmapFree(ret[i]->cpumask);
VIR_FREE(ret[i]); VIR_FREE(ret[i]);

4
src/conf/domain_conf.h
View File

@ -1910,8 +1910,8 @@ struct _virDomainPinDef {
void virDomainPinDefFree(virDomainPinDefPtr def); void virDomainPinDefFree(virDomainPinDefPtr def);
void virDomainPinDefArrayFree(virDomainPinDefPtr *def, int npin); void virDomainPinDefArrayFree(virDomainPinDefPtr *def, int npin);
virDomainPinDefPtr *virDomainVcpuPinDefCopy(virDomainPinDefPtr *src, virDomainPinDefPtr *virDomainPinDefCopy(virDomainPinDefPtr *src,
int nvcpupin); int npin);
int virDomainVcpuPinIsDuplicate(virDomainPinDefPtr *def, int virDomainVcpuPinIsDuplicate(virDomainPinDefPtr *def,
int nvcpupin, int nvcpupin,

2
src/libvirt_private.syms
View File

@ -385,6 +385,7 @@ virDomainParseMemory;
virDomainPausedReasonTypeFromString; virDomainPausedReasonTypeFromString;
virDomainPausedReasonTypeToString; virDomainPausedReasonTypeToString;
virDomainPinDefArrayFree; virDomainPinDefArrayFree;
virDomainPinDefCopy;
virDomainPinDefFree; virDomainPinDefFree;
virDomainPMSuspendedReasonTypeFromString; virDomainPMSuspendedReasonTypeFromString;
virDomainPMSuspendedReasonTypeToString; virDomainPMSuspendedReasonTypeToString;
@ -438,7 +439,6 @@ virDomainTPMDefFree;
virDomainTPMModelTypeFromString; virDomainTPMModelTypeFromString;
virDomainTPMModelTypeToString; virDomainTPMModelTypeToString;
virDomainVcpuPinAdd; virDomainVcpuPinAdd;
virDomainVcpuPinDefCopy;
virDomainVcpuPinDel; virDomainVcpuPinDel;
virDomainVcpuPinFindByVcpu; virDomainVcpuPinFindByVcpu;
virDomainVcpuPinIsDuplicate; virDomainVcpuPinIsDuplicate;

9
src/qemu/qemu_driver.c
View File

@ -5111,8 +5111,8 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
} }
if (vm->def->cputune.vcpupin) { if (vm->def->cputune.vcpupin) {
newVcpuPin = virDomainVcpuPinDefCopy(vm->def->cputune.vcpupin, newVcpuPin = virDomainPinDefCopy(vm->def->cputune.vcpupin,
vm->def->cputune.nvcpupin); vm->def->cputune.nvcpupin);
if (!newVcpuPin) if (!newVcpuPin)
goto endjob; goto endjob;
@ -5984,10 +5984,9 @@ qemuDomainPinIOThread(virDomainPtr dom,
} }
if (vm->def->cputune.iothreadspin) { if (vm->def->cputune.iothreadspin) {
/* The VcpuPinDefCopy works for IOThreads too */
newIOThreadsPin = newIOThreadsPin =
virDomainVcpuPinDefCopy(vm->def->cputune.iothreadspin, virDomainPinDefCopy(vm->def->cputune.iothreadspin,
vm->def->cputune.niothreadspin); vm->def->cputune.niothreadspin);
if (!newIOThreadsPin) if (!newIOThreadsPin)
goto endjob; goto endjob;