NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Convert virDomainVcpuPinFindByVcpu into virDomainPinFindByVcpu

Browse Source 
Since both Vcpu and IOThreads code use the same API's, alter the naming
of the API's to remove the "Vcpu" specific reference
This commit is contained in:
John Ferlan 2015-03-10 20:31:44 -04:00
parent 8cf80b517e
commit a8a89270ef
5 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/conf/domain_conf.c
View File

@ -16754,17 +16754,17 @@ virDomainPinIsDuplicate(virDomainPinDefPtr *def,
} }
virDomainPinDefPtr virDomainPinDefPtr
virDomainVcpuPinFindByVcpu(virDomainPinDefPtr *def, virDomainPinFind(virDomainPinDefPtr *def,
int nvcpupin, int npin,
int vcpu) int id)
{ {
size_t i; size_t i;
if (!def || !nvcpupin) if (!def || !npin)
return NULL; return NULL;
for (i = 0; i < nvcpupin; i++) { for (i = 0; i < npin; i++) {
if (def[i]->id == vcpu) if (def[i]->id == id)
return def[i]; return def[i];
} }
@ -16783,9 +16783,9 @@ virDomainVcpuPinAdd(virDomainPinDefPtr **vcpupin_list,
if (!vcpupin_list) if (!vcpupin_list)
return -1; return -1;
vcpupin = virDomainVcpuPinFindByVcpu(*vcpupin_list, vcpupin = virDomainPinFind(*vcpupin_list,
*nvcpupin, *nvcpupin,
vcpu); vcpu);
if (vcpupin) { if (vcpupin) {
vcpupin->id = vcpu; vcpupin->id = vcpu;
virBitmapFree(vcpupin->cpumask); virBitmapFree(vcpupin->cpumask);
@ -16889,9 +16889,9 @@ virDomainIOThreadsPinAdd(virDomainPinDefPtr **iothreadspin_list,
if (!iothreadspin_list) if (!iothreadspin_list)
return -1; return -1;
iothreadpin = virDomainVcpuPinFindByVcpu(*iothreadspin_list, iothreadpin = virDomainPinFind(*iothreadspin_list,
*niothreadspin, *niothreadspin,
iothread_id); iothread_id);
if (iothreadpin) { if (iothreadpin) {
iothreadpin->id = iothread_id; iothreadpin->id = iothread_id;
virBitmapFree(iothreadpin->cpumask); virBitmapFree(iothreadpin->cpumask);

6
src/conf/domain_conf.h
View File

@ -1917,9 +1917,9 @@ int virDomainPinIsDuplicate(virDomainPinDefPtr *def,
int npin, int npin,
int id); int id);
virDomainPinDefPtr virDomainVcpuPinFindByVcpu(virDomainPinDefPtr *def, virDomainPinDefPtr virDomainPinFind(virDomainPinDefPtr *def,
int nvcpupin, int npin,
int vcpu); int id);
typedef struct _virBlkioDevice virBlkioDevice; typedef struct _virBlkioDevice virBlkioDevice;
typedef virBlkioDevice *virBlkioDevicePtr; typedef virBlkioDevice *virBlkioDevicePtr;

2
src/libvirt_private.syms
View File

@ -387,6 +387,7 @@ virDomainPausedReasonTypeToString;
virDomainPinDefArrayFree; virDomainPinDefArrayFree;
virDomainPinDefCopy; virDomainPinDefCopy;
virDomainPinDefFree; virDomainPinDefFree;
virDomainPinFind;
virDomainPinIsDuplicate; virDomainPinIsDuplicate;
virDomainPMSuspendedReasonTypeFromString; virDomainPMSuspendedReasonTypeFromString;
virDomainPMSuspendedReasonTypeToString; virDomainPMSuspendedReasonTypeToString;
@ -441,7 +442,6 @@ virDomainTPMModelTypeFromString;
virDomainTPMModelTypeToString; virDomainTPMModelTypeToString;
virDomainVcpuPinAdd; virDomainVcpuPinAdd;
virDomainVcpuPinDel; virDomainVcpuPinDel;
virDomainVcpuPinFindByVcpu;
virDomainVideoDefaultRAM; virDomainVideoDefaultRAM;
virDomainVideoDefaultType; virDomainVideoDefaultType;
virDomainVideoDefFree; virDomainVideoDefFree;

12
src/qemu/qemu_driver.c
View File

@ -5288,9 +5288,9 @@ qemuDomainGetVcpuPinInfo(virDomainPtr dom,
unsigned char *tmpmap = NULL; unsigned char *tmpmap = NULL;
int tmpmaplen; int tmpmaplen;
pininfo = virDomainVcpuPinFindByVcpu(targetDef->cputune.vcpupin, pininfo = virDomainPinFind(targetDef->cputune.vcpupin,
targetDef->cputune.nvcpupin, targetDef->cputune.nvcpupin,
vcpu); vcpu);
if (!pininfo) { if (!pininfo) {
if (!(bitmap = virBitmapNew(hostcpus))) if (!(bitmap = virBitmapNew(hostcpus)))
goto cleanup; goto cleanup;
@ -5824,9 +5824,9 @@ qemuDomainGetIOThreadsConfig(virDomainDefPtr targetDef,
info_ret[i]->iothread_id = i + 1; info_ret[i]->iothread_id = i + 1;
/* Initialize the cpumap */ /* Initialize the cpumap */
pininfo = virDomainVcpuPinFindByVcpu(targetDef->cputune.iothreadspin, pininfo = virDomainPinFind(targetDef->cputune.iothreadspin,
targetDef->cputune.niothreadspin, targetDef->cputune.niothreadspin,
i + 1); i + 1);
if (!pininfo) { if (!pininfo) {
if (targetDef->cpumask) { if (targetDef->cpumask) {
cpumask = targetDef->cpumask; cpumask = targetDef->cpumask;

12
src/qemu/qemu_process.c
View File

@ -2438,9 +2438,9 @@ qemuProcessSetVcpuAffinities(virDomainObjPtr vm)
for (n = 0; n < def->vcpus; n++) { for (n = 0; n < def->vcpus; n++) {
/* set affinity only for existing vcpus */ /* set affinity only for existing vcpus */
if (!(pininfo = virDomainVcpuPinFindByVcpu(def->cputune.vcpupin, if (!(pininfo = virDomainPinFind(def->cputune.vcpupin,
def->cputune.nvcpupin, def->cputune.nvcpupin,
n))) n)))
continue; continue;
if (virProcessSetAffinity(priv->vcpupids[n], if (virProcessSetAffinity(priv->vcpupids[n],
@ -2494,9 +2494,9 @@ qemuProcessSetIOThreadsAffinity(virDomainObjPtr vm)
for (i = 0; i < def->iothreads; i++) { for (i = 0; i < def->iothreads; i++) {
/* set affinity only for existing vcpus */ /* set affinity only for existing vcpus */
if (!(pininfo = virDomainVcpuPinFindByVcpu(def->cputune.iothreadspin, if (!(pininfo = virDomainPinFind(def->cputune.iothreadspin,
def->cputune.niothreadspin, def->cputune.niothreadspin,
i + 1))) i + 1)))
continue; continue;
if (virProcessSetAffinity(priv->iothreadpids[i], pininfo->cpumask) < 0) if (virProcessSetAffinity(priv->iothreadpids[i], pininfo->cpumask) < 0)