提交 c16723f6 编写于 作者: J John Ferlan

Convert virDomainVcpuPinDefCopy into virDomainPinDefCopy

Since both Vcpu and IOThreads code use the same API's, alter the naming
of the API's to remove the "Vcpu" specific reference
上级 24b15ea9
...@@ -2004,15 +2004,15 @@ virDomainClockDefClear(virDomainClockDefPtr def) ...@@ -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) ...@@ -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]);
......
...@@ -1910,8 +1910,8 @@ struct _virDomainPinDef { ...@@ -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,
......
...@@ -385,6 +385,7 @@ virDomainParseMemory; ...@@ -385,6 +385,7 @@ virDomainParseMemory;
virDomainPausedReasonTypeFromString; virDomainPausedReasonTypeFromString;
virDomainPausedReasonTypeToString; virDomainPausedReasonTypeToString;
virDomainPinDefArrayFree; virDomainPinDefArrayFree;
virDomainPinDefCopy;
virDomainPinDefFree; virDomainPinDefFree;
virDomainPMSuspendedReasonTypeFromString; virDomainPMSuspendedReasonTypeFromString;
virDomainPMSuspendedReasonTypeToString; virDomainPMSuspendedReasonTypeToString;
...@@ -438,7 +439,6 @@ virDomainTPMDefFree; ...@@ -438,7 +439,6 @@ virDomainTPMDefFree;
virDomainTPMModelTypeFromString; virDomainTPMModelTypeFromString;
virDomainTPMModelTypeToString; virDomainTPMModelTypeToString;
virDomainVcpuPinAdd; virDomainVcpuPinAdd;
virDomainVcpuPinDefCopy;
virDomainVcpuPinDel; virDomainVcpuPinDel;
virDomainVcpuPinFindByVcpu; virDomainVcpuPinFindByVcpu;
virDomainVcpuPinIsDuplicate; virDomainVcpuPinIsDuplicate;
......
...@@ -5111,8 +5111,8 @@ qemuDomainPinVcpuFlags(virDomainPtr dom, ...@@ -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, ...@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册