10:11 p.m.
This one is no longer necessary
Signed-off-by: John Ferlan <jferlan(a)redhat.com>
---
src/conf/domain_conf.c | 45 ---------------------------------------------
src/conf/domain_conf.h | 6 ------
src/libvirt_private.syms | 1 -
src/qemu/qemu_driver.c | 14 +++++++-------
4 files changed, 7 insertions(+), 59 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 4a9d083..19aa6f6 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -16814,51 +16814,6 @@ virDomainEmulatorPinDel(virDomainDefPtr def)
return 0;
}
-int
-virDomainIOThreadsPinAdd(virDomainPinDefPtr **iothreadspin_list,
- size_t *niothreadspin,
- unsigned char *cpumap,
- int maplen,
- unsigned int iothread_id)
-{
- virDomainPinDefPtr iothreadpin = NULL;
-
- if (!iothreadspin_list)
- return -1;
-
- iothreadpin = virDomainPinFindByVcpu(*iothreadspin_list,
- *niothreadspin,
- iothread_id);
- if (iothreadpin) {
- iothreadpin->id = iothread_id;
- virBitmapFree(iothreadpin->cpumask);
- iothreadpin->cpumask = virBitmapNewData(cpumap, maplen);
- if (!iothreadpin->cpumask)
- return -1;
-
- return 0;
- }
-
- /* No existing iothreadpin matches iothread_id, adding a new one */
-
- if (VIR_ALLOC(iothreadpin) < 0)
- goto error;
-
- iothreadpin->id = iothread_id;
- iothreadpin->cpumask = virBitmapNewData(cpumap, maplen);
- if (!iothreadpin->cpumask)
- goto error;
-
- if (VIR_APPEND_ELEMENT(*iothreadspin_list, *niothreadspin, iothreadpin) < 0)
- goto error;
-
- return 0;
-
- error:
- virDomainPinDefFree(iothreadpin);
- return -1;
-}
-
void
virDomainIOThreadsPinDel(virDomainDefPtr def,
unsigned int iothread_id)
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 10fdbb0..1ba1ffe 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2563,12 +2563,6 @@ int virDomainEmulatorPinAdd(virDomainDefPtr def,
int virDomainEmulatorPinDel(virDomainDefPtr def);
-int virDomainIOThreadsPinAdd(virDomainPinDefPtr **iothreadspin_list,
- size_t *niothreads,
- unsigned char *cpumap,
- int maplen,
- unsigned int iothread_id);
-
void virDomainIOThreadsPinDel(virDomainDefPtr def,
unsigned int iothread_id);
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 54c931e..108e806 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -309,7 +309,6 @@ virDomainHubTypeToString;
virDomainHypervTypeFromString;
virDomainHypervTypeToString;
virDomainInputDefFree;
-virDomainIOThreadsPinAdd;
virDomainIOThreadsPinDel;
virDomainLeaseDefFree;
virDomainLeaseIndex;
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 3e40724..db8cf4f 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5852,8 +5852,8 @@ qemuDomainPinIOThread(virDomainPtr dom,
newIOThreadsPinNum = 0;
}
- if (virDomainIOThreadsPinAdd(&newIOThreadsPin, &newIOThreadsPinNum,
- cpumap, maplen, iothread_id) < 0) {
+ if (virDomainPinAdd(&newIOThreadsPin, &newIOThreadsPinNum,
+ cpumap, maplen, iothread_id) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("failed to update iothreadspin"));
goto endjob;
@@ -5924,11 +5924,11 @@ qemuDomainPinIOThread(virDomainPtr dom,
goto endjob;
persistentDef->cputune.niothreadspin = 0;
}
- if (virDomainIOThreadsPinAdd(&persistentDef->cputune.iothreadspin,
- &persistentDef->cputune.niothreadspin,
- cpumap,
- maplen,
- iothread_id) < 0) {
+ if (virDomainPinAdd(&persistentDef->cputune.iothreadspin,
+ &persistentDef->cputune.niothreadspin,
+ cpumap,
+ maplen,
+ iothread_id) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("failed to update or add iothreadspin xml "
"of a persistent domain"));
--
2.1.0