Convert virDomainVcpuPinDefArrayFree to virDomainPinDefArrayFree

Since both Vcpu and IOThreads code use the same API's, alter the naming
of the API's to remove the "Vcpu" specific reference

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index f495a0900b331d186fe29b0830c8d4b746cc498b..3fb8ea886357f85cd76d8fa6dacc32e4ecfd9510 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2046,15 +2046,15 @@ virDomainPinDefFree(virDomainPinDefPtr def)
 }
 
 void
-virDomainVcpuPinDefArrayFree(virDomainPinDefPtr *def,
-                             int nvcpupin)
+virDomainPinDefArrayFree(virDomainPinDefPtr *def,
+                         int npin)
 {
     size_t i;
 
     if (!def)
         return;
 
-    for (i = 0; i < nvcpupin; i++)
+    for (i = 0; i < npin; i++)
         virDomainPinDefFree(def[i]);
 
     VIR_FREE(def);
@@ -2229,11 +2229,11 @@ void virDomainDefFree(virDomainDefPtr def)
 
     virCPUDefFree(def->cpu);
 
-    virDomainVcpuPinDefArrayFree(def->cputune.vcpupin, def->cputune.nvcpupin);
+    virDomainPinDefArrayFree(def->cputune.vcpupin, def->cputune.nvcpupin);
 
     virDomainPinDefFree(def->cputune.emulatorpin);
 
-    virDomainVcpuPinDefArrayFree(def->cputune.iothreadspin,
+    virDomainPinDefArrayFree(def->cputune.iothreadspin,
                                  def->cputune.niothreadspin);
 
     for (i = 0; i < def->cputune.nvcpusched; i++)

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 57c36c11b563f121751272671ed8a0329cf901de..341be5f01ee8e615d5e1cd0f044086ad724ba4d4 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1908,7 +1908,7 @@ struct _virDomainPinDef {
 };
 
 void virDomainPinDefFree(virDomainPinDefPtr def);
-void virDomainVcpuPinDefArrayFree(virDomainPinDefPtr *def, int nvcpupin);
+void virDomainPinDefArrayFree(virDomainPinDefPtr *def, int npin);
 
 virDomainPinDefPtr *virDomainVcpuPinDefCopy(virDomainPinDefPtr *src,
                                             int nvcpupin);

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 14cf3c7d87ba4a52a5516d10350b778c79c51309..cbc3aea972ac759f3a53a2ccf6ac3a60f9e65da9 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -384,6 +384,7 @@ virDomainObjTaint;
 virDomainParseMemory;
 virDomainPausedReasonTypeFromString;
 virDomainPausedReasonTypeToString;
+virDomainPinDefArrayFree;
 virDomainPinDefFree;
 virDomainPMSuspendedReasonTypeFromString;
 virDomainPMSuspendedReasonTypeToString;
@@ -437,7 +438,6 @@ virDomainTPMDefFree;
 virDomainTPMModelTypeFromString;
 virDomainTPMModelTypeToString;
 virDomainVcpuPinAdd;
-virDomainVcpuPinDefArrayFree;
 virDomainVcpuPinDefCopy;
 virDomainVcpuPinDel;
 virDomainVcpuPinFindByVcpu;

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 4b644f7df2a982f2895476619867e7c8a47b8c05..d20118703af962b9d9060608ebf35626d8dda0fb 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5154,8 +5154,8 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
             virDomainVcpuPinDel(vm->def, vcpu);
         } else {
             if (vm->def->cputune.vcpupin)
-                virDomainVcpuPinDefArrayFree(vm->def->cputune.vcpupin,
-                                             vm->def->cputune.nvcpupin);
+                virDomainPinDefArrayFree(vm->def->cputune.vcpupin,
+                                         vm->def->cputune.nvcpupin);
 
             vm->def->cputune.vcpupin = newVcpuPin;
             vm->def->cputune.nvcpupin = newVcpuPinNum;
@@ -5211,7 +5211,7 @@ qemuDomainPinVcpuFlags(virDomainPtr dom,
 
  cleanup:
     if (newVcpuPin)
-        virDomainVcpuPinDefArrayFree(newVcpuPin, newVcpuPinNum);
+        virDomainPinDefArrayFree(newVcpuPin, newVcpuPinNum);
     if (cgroup_vcpu)
         virCgroupFree(&cgroup_vcpu);
     qemuDomObjEndAPI(&vm);
@@ -5403,7 +5403,7 @@ qemuDomainPinEmulator(virDomainPtr dom,
             if (virDomainVcpuPinAdd(&newVcpuPin, &newVcpuPinNum, cpumap, maplen, -1) < 0) {
                 virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                                _("failed to update vcpupin"));
-                virDomainVcpuPinDefArrayFree(newVcpuPin, newVcpuPinNum);
+                virDomainPinDefArrayFree(newVcpuPin, newVcpuPinNum);
                 goto endjob;
             }
 
@@ -5444,7 +5444,7 @@ qemuDomainPinEmulator(virDomainPtr dom,
             }
 
             if (newVcpuPin)
-                virDomainVcpuPinDefArrayFree(newVcpuPin, newVcpuPinNum);
+                virDomainPinDefArrayFree(newVcpuPin, newVcpuPinNum);
         } else {
             virReportError(VIR_ERR_OPERATION_INVALID,
                            "%s", _("cpu affinity is not supported"));
@@ -6031,8 +6031,8 @@ qemuDomainPinIOThread(virDomainPtr dom,
         }
 
         if (vm->def->cputune.iothreadspin)
-            virDomainVcpuPinDefArrayFree(vm->def->cputune.iothreadspin,
-                                         vm->def->cputune.niothreadspin);
+            virDomainPinDefArrayFree(vm->def->cputune.iothreadspin,
+                                     vm->def->cputune.niothreadspin);
 
         vm->def->cputune.iothreadspin = newIOThreadsPin;
         vm->def->cputune.niothreadspin = newIOThreadsPinNum;
@@ -6092,7 +6092,7 @@ qemuDomainPinIOThread(virDomainPtr dom,
 
  cleanup:
     if (newIOThreadsPin)
-        virDomainVcpuPinDefArrayFree(newIOThreadsPin, newIOThreadsPinNum);
+        virDomainPinDefArrayFree(newIOThreadsPin, newIOThreadsPinNum);
     if (cgroup_iothread)
         virCgroupFree(&cgroup_iothread);
     if (event)