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

Convert virDomainVcpuPinFindByVcpu into virDomainPinFindByVcpu

Since both Vcpu and IOThreads code use the same API's, alter the naming
of the API's to remove the "Vcpu" specific reference
上级 8cf80b51
......@@ -16754,17 +16754,17 @@ virDomainPinIsDuplicate(virDomainPinDefPtr *def,
}
virDomainPinDefPtr
virDomainVcpuPinFindByVcpu(virDomainPinDefPtr *def,
int nvcpupin,
int vcpu)
virDomainPinFind(virDomainPinDefPtr *def,
int npin,
int id)
{
size_t i;
if (!def || !nvcpupin)
if (!def || !npin)
return NULL;
for (i = 0; i < nvcpupin; i++) {
if (def[i]->id == vcpu)
for (i = 0; i < npin; i++) {
if (def[i]->id == id)
return def[i];
}
......@@ -16783,9 +16783,9 @@ virDomainVcpuPinAdd(virDomainPinDefPtr **vcpupin_list,
if (!vcpupin_list)
return -1;
vcpupin = virDomainVcpuPinFindByVcpu(*vcpupin_list,
*nvcpupin,
vcpu);
vcpupin = virDomainPinFind(*vcpupin_list,
*nvcpupin,
vcpu);
if (vcpupin) {
vcpupin->id = vcpu;
virBitmapFree(vcpupin->cpumask);
......@@ -16889,9 +16889,9 @@ virDomainIOThreadsPinAdd(virDomainPinDefPtr **iothreadspin_list,
if (!iothreadspin_list)
return -1;
iothreadpin = virDomainVcpuPinFindByVcpu(*iothreadspin_list,
*niothreadspin,
iothread_id);
iothreadpin = virDomainPinFind(*iothreadspin_list,
*niothreadspin,
iothread_id);
if (iothreadpin) {
iothreadpin->id = iothread_id;
virBitmapFree(iothreadpin->cpumask);
......
......@@ -1917,9 +1917,9 @@ int virDomainPinIsDuplicate(virDomainPinDefPtr *def,
int npin,
int id);
virDomainPinDefPtr virDomainVcpuPinFindByVcpu(virDomainPinDefPtr *def,
int nvcpupin,
int vcpu);
virDomainPinDefPtr virDomainPinFind(virDomainPinDefPtr *def,
int npin,
int id);
typedef struct _virBlkioDevice virBlkioDevice;
typedef virBlkioDevice *virBlkioDevicePtr;
......
......@@ -387,6 +387,7 @@ virDomainPausedReasonTypeToString;
virDomainPinDefArrayFree;
virDomainPinDefCopy;
virDomainPinDefFree;
virDomainPinFind;
virDomainPinIsDuplicate;
virDomainPMSuspendedReasonTypeFromString;
virDomainPMSuspendedReasonTypeToString;
......@@ -441,7 +442,6 @@ virDomainTPMModelTypeFromString;
virDomainTPMModelTypeToString;
virDomainVcpuPinAdd;
virDomainVcpuPinDel;
virDomainVcpuPinFindByVcpu;
virDomainVideoDefaultRAM;
virDomainVideoDefaultType;
virDomainVideoDefFree;
......
......@@ -5288,9 +5288,9 @@ qemuDomainGetVcpuPinInfo(virDomainPtr dom,
unsigned char *tmpmap = NULL;
int tmpmaplen;
pininfo = virDomainVcpuPinFindByVcpu(targetDef->cputune.vcpupin,
targetDef->cputune.nvcpupin,
vcpu);
pininfo = virDomainPinFind(targetDef->cputune.vcpupin,
targetDef->cputune.nvcpupin,
vcpu);
if (!pininfo) {
if (!(bitmap = virBitmapNew(hostcpus)))
goto cleanup;
......@@ -5824,9 +5824,9 @@ qemuDomainGetIOThreadsConfig(virDomainDefPtr targetDef,
info_ret[i]->iothread_id = i + 1;
/* Initialize the cpumap */
pininfo = virDomainVcpuPinFindByVcpu(targetDef->cputune.iothreadspin,
targetDef->cputune.niothreadspin,
i + 1);
pininfo = virDomainPinFind(targetDef->cputune.iothreadspin,
targetDef->cputune.niothreadspin,
i + 1);
if (!pininfo) {
if (targetDef->cpumask) {
cpumask = targetDef->cpumask;
......
......@@ -2438,9 +2438,9 @@ qemuProcessSetVcpuAffinities(virDomainObjPtr vm)
for (n = 0; n < def->vcpus; n++) {
/* set affinity only for existing vcpus */
if (!(pininfo = virDomainVcpuPinFindByVcpu(def->cputune.vcpupin,
def->cputune.nvcpupin,
n)))
if (!(pininfo = virDomainPinFind(def->cputune.vcpupin,
def->cputune.nvcpupin,
n)))
continue;
if (virProcessSetAffinity(priv->vcpupids[n],
......@@ -2494,9 +2494,9 @@ qemuProcessSetIOThreadsAffinity(virDomainObjPtr vm)
for (i = 0; i < def->iothreads; i++) {
/* set affinity only for existing vcpus */
if (!(pininfo = virDomainVcpuPinFindByVcpu(def->cputune.iothreadspin,
def->cputune.niothreadspin,
i + 1)))
if (!(pininfo = virDomainPinFind(def->cputune.iothreadspin,
def->cputune.niothreadspin,
i + 1)))
continue;
if (virProcessSetAffinity(priv->iothreadpids[i], pininfo->cpumask) < 0)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册