From a8a89270ef3db48ebad3fb61611bc8f89865ca1e Mon Sep 17 00:00:00 2001
From: John Ferlan <jferlan@redhat.com>
Date: Tue, 10 Mar 2015 20:31:44 -0400
Subject: [PATCH] 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
---
 src/conf/domain_conf.c   | 24 ++++++++++++------------
 src/conf/domain_conf.h   |  6 +++---
 src/libvirt_private.syms |  2 +-
 src/qemu/qemu_driver.c   | 12 ++++++------
 src/qemu/qemu_process.c  | 12 ++++++------
 5 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index d3dfefa449..7f1735b6cb 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -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);
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 800d69730f..3d8795f02e 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -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;
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 0481bfd85d..7e652291d1 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -387,6 +387,7 @@ virDomainPausedReasonTypeToString;
 virDomainPinDefArrayFree;
 virDomainPinDefCopy;
 virDomainPinDefFree;
+virDomainPinFind;
 virDomainPinIsDuplicate;
 virDomainPMSuspendedReasonTypeFromString;
 virDomainPMSuspendedReasonTypeToString;
@@ -441,7 +442,6 @@ virDomainTPMModelTypeFromString;
 virDomainTPMModelTypeToString;
 virDomainVcpuPinAdd;
 virDomainVcpuPinDel;
-virDomainVcpuPinFindByVcpu;
 virDomainVideoDefaultRAM;
 virDomainVideoDefaultType;
 virDomainVideoDefFree;
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 66ef95fbc2..a941bcfee2 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -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;
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 51cae97c29..5bb7e5b390 100644
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -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)
-- 
GitLab