10:11 p.m.
Make common between Vcpu and IOThreads
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/conf/domain_conf.c | 20 ++++++++++----------
src/conf/domain_conf.h | 2 +-
src/libvirt_private.syms | 2 +-
src/qemu/qemu_driver.c | 2 +-
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 04de04e..db04855 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2037,7 +2037,7 @@ virDomainVcpuPinDefCopy(virDomainPinDefPtr *src, int nvcpupin)
}
void
-virDomainVcpuPinDefFree(virDomainPinDefPtr def)
+virDomainPinDefFree(virDomainPinDefPtr def)
{
if (def) {
virBitmapFree(def->cpumask);
@@ -2055,7 +2055,7 @@ virDomainVcpuPinDefArrayFree(virDomainPinDefPtr *def,
return;
for (i = 0; i < nvcpupin; i++)
- virDomainVcpuPinDefFree(def[i]);
+ virDomainPinDefFree(def[i]);
VIR_FREE(def);
}
@@ -2231,7 +2231,7 @@ void virDomainDefFree(virDomainDefPtr def)
virDomainVcpuPinDefArrayFree(def->cputune.vcpupin, def->cputune.nvcpupin);
- virDomainVcpuPinDefFree(def->cputune.emulatorpin);
+ virDomainPinDefFree(def->cputune.emulatorpin);
virDomainVcpuPinDefArrayFree(def->cputune.iothreadspin,
def->cputune.niothreadspin);
@@ -13474,7 +13474,7 @@ virDomainDefParseXML(xmlDocPtr xml,
vcpupin->id)) {
virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("duplicate vcpupin for same
vcpu"));
- virDomainVcpuPinDefFree(vcpupin);
+ virDomainPinDefFree(vcpupin);
goto error;
}
@@ -13485,7 +13485,7 @@ virDomainDefParseXML(xmlDocPtr xml,
* ignoring them instead.
*/
VIR_WARN("Ignore vcpupin for not onlined vcpus");
- virDomainVcpuPinDefFree(vcpupin);
+ virDomainPinDefFree(vcpupin);
} else {
def->cputune.vcpupin[def->cputune.nvcpupin++] = vcpupin;
}
@@ -13566,7 +13566,7 @@ virDomainDefParseXML(xmlDocPtr xml,
iothreadpin->id)) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("duplicate iothreadpin for same iothread"));
- virDomainVcpuPinDefFree(iothreadpin);
+ virDomainPinDefFree(iothreadpin);
goto error;
}
@@ -16751,7 +16751,7 @@ virDomainVcpuPinAdd(virDomainPinDefPtr **vcpupin_list,
return 0;
error:
- virDomainVcpuPinDefFree(vcpupin);
+ virDomainPinDefFree(vcpupin);
return -1;
}
@@ -16786,7 +16786,7 @@ virDomainEmulatorPinAdd(virDomainDefPtr def,
emulatorpin->id = -1;
emulatorpin->cpumask = virBitmapNewData(cpumap, maplen);
if (!emulatorpin->cpumask) {
- virDomainVcpuPinDefFree(emulatorpin);
+ virDomainPinDefFree(emulatorpin);
return -1;
}
@@ -16810,7 +16810,7 @@ virDomainEmulatorPinDel(virDomainDefPtr def)
if (!def->cputune.emulatorpin)
return 0;
- virDomainVcpuPinDefFree(def->cputune.emulatorpin);
+ virDomainPinDefFree(def->cputune.emulatorpin);
def->cputune.emulatorpin = NULL;
return 0;
@@ -16857,7 +16857,7 @@ virDomainIOThreadsPinAdd(virDomainPinDefPtr **iothreadspin_list,
return 0;
error:
- virDomainVcpuPinDefFree(iothreadpin);
+ virDomainPinDefFree(iothreadpin);
return -1;
}
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index f7f1146..3f04832 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1903,7 +1903,7 @@ struct _virDomainPinDef {
virBitmapPtr cpumask;
};
-void virDomainVcpuPinDefFree(virDomainPinDefPtr def);
+void virDomainPinDefFree(virDomainPinDefPtr def);
void virDomainVcpuPinDefArrayFree(virDomainPinDefPtr *def, int nvcpupin);
virDomainPinDefPtr *virDomainVcpuPinDefCopy(virDomainPinDefPtr *src,
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 63e378b..adcb456 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -381,6 +381,7 @@ virDomainObjTaint;
virDomainParseMemory;
virDomainPausedReasonTypeFromString;
virDomainPausedReasonTypeToString;
+virDomainPinDefFree;
virDomainPMSuspendedReasonTypeFromString;
virDomainPMSuspendedReasonTypeToString;
virDomainRedirdevBusTypeFromString;
@@ -435,7 +436,6 @@ virDomainTPMModelTypeToString;
virDomainVcpuPinAdd;
virDomainVcpuPinDefArrayFree;
virDomainVcpuPinDefCopy;
-virDomainVcpuPinDefFree;
virDomainVcpuPinDel;
virDomainVcpuPinFindByVcpu;
virDomainVcpuPinIsDuplicate;
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 94221fb..fed0c0d 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5293,7 +5293,7 @@ qemuDomainPinEmulator(virDomainPtr dom,
goto endjob;
}
} else {
- virDomainVcpuPinDefFree(vm->def->cputune.emulatorpin);
+ virDomainPinDefFree(vm->def->cputune.emulatorpin);
vm->def->cputune.emulatorpin = newVcpuPin[0];
VIR_FREE(newVcpuPin);
}
--
2.1.0