External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-10 23:07:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

vircgroup.c: turn virCgroup{Get/Set}BlkioDevice* into static

Browse Source 
Previous patch moved all duplicated code that were setting
and getting BlkioDevice parameters to vircgroup.c. We can
turn them into static and spare a few symbols in
libvirt_private.syms.

Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Daniel Henrique Barboza 2020-02-17 16:29:10 -05:00 committed by Ján Tomko
parent 17e8af6b45
commit adfd20f043
3 changed files with 20 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libvirt_private.syms
View File

@ -1672,11 +1672,6 @@ virCgroupDenyAllDevices;
virCgroupDenyDevice; virCgroupDenyDevice;
virCgroupDenyDevicePath; virCgroupDenyDevicePath;
virCgroupFree; virCgroupFree;
virCgroupGetBlkioDeviceReadBps;
virCgroupGetBlkioDeviceReadIops;
virCgroupGetBlkioDeviceWeight;
virCgroupGetBlkioDeviceWriteBps;
virCgroupGetBlkioDeviceWriteIops;
virCgroupGetBlkioIoDeviceServiced; virCgroupGetBlkioIoDeviceServiced;
virCgroupGetBlkioIoServiced; virCgroupGetBlkioIoServiced;
virCgroupGetBlkioWeight; virCgroupGetBlkioWeight;
@ -1713,11 +1708,6 @@ virCgroupNewSelf;
virCgroupNewThread; virCgroupNewThread;
virCgroupPathOfController; virCgroupPathOfController;
virCgroupRemove; virCgroupRemove;
virCgroupSetBlkioDeviceReadBps;
virCgroupSetBlkioDeviceReadIops;
virCgroupSetBlkioDeviceWeight;
virCgroupSetBlkioDeviceWriteBps;
virCgroupSetBlkioDeviceWriteIops;
virCgroupSetBlkioWeight; virCgroupSetBlkioWeight;
virCgroupSetCpuCfsPeriod; virCgroupSetCpuCfsPeriod;
virCgroupSetCpuCfsQuota; virCgroupSetCpuCfsQuota;

40
src/util/vircgroup.c
View File

@ -1415,7 +1415,7 @@ virCgroupGetBlkioWeight(virCgroupPtr group, unsigned int *weight)
* *
* Returns: 0 on success, -1 on error * Returns: 0 on success, -1 on error
*/ */
int static int
virCgroupSetBlkioDeviceReadIops(virCgroupPtr group, virCgroupSetBlkioDeviceReadIops(virCgroupPtr group,
const char *path, const char *path,
unsigned int riops) unsigned int riops)
@ -1433,7 +1433,7 @@ virCgroupSetBlkioDeviceReadIops(virCgroupPtr group,
* *
* Returns: 0 on success, -1 on error * Returns: 0 on success, -1 on error
*/ */
int static int
virCgroupSetBlkioDeviceWriteIops(virCgroupPtr group, virCgroupSetBlkioDeviceWriteIops(virCgroupPtr group,
const char *path, const char *path,
unsigned int wiops) unsigned int wiops)
@ -1451,7 +1451,7 @@ virCgroupSetBlkioDeviceWriteIops(virCgroupPtr group,
* *
* Returns: 0 on success, -1 on error * Returns: 0 on success, -1 on error
*/ */
int static int
virCgroupSetBlkioDeviceReadBps(virCgroupPtr group, virCgroupSetBlkioDeviceReadBps(virCgroupPtr group,
const char *path, const char *path,
unsigned long long rbps) unsigned long long rbps)
@ -1468,7 +1468,7 @@ virCgroupSetBlkioDeviceReadBps(virCgroupPtr group,
* *
* Returns: 0 on success, -1 on error * Returns: 0 on success, -1 on error
*/ */
int static int
virCgroupSetBlkioDeviceWriteBps(virCgroupPtr group, virCgroupSetBlkioDeviceWriteBps(virCgroupPtr group,
const char *path, const char *path,
unsigned long long wbps) unsigned long long wbps)
@ -1487,7 +1487,7 @@ virCgroupSetBlkioDeviceWriteBps(virCgroupPtr group,
* *
* Returns: 0 on success, -1 on error * Returns: 0 on success, -1 on error
*/ */
int static int
virCgroupSetBlkioDeviceWeight(virCgroupPtr group, virCgroupSetBlkioDeviceWeight(virCgroupPtr group,
const char *path, const char *path,
unsigned int weight) unsigned int weight)
@ -1504,7 +1504,7 @@ virCgroupSetBlkioDeviceWeight(virCgroupPtr group,
* *
* Returns: 0 on success, -1 on error * Returns: 0 on success, -1 on error
*/ */
int static int
virCgroupGetBlkioDeviceReadIops(virCgroupPtr group, virCgroupGetBlkioDeviceReadIops(virCgroupPtr group,
const char *path, const char *path,
unsigned int *riops) unsigned int *riops)
@ -1521,7 +1521,7 @@ virCgroupGetBlkioDeviceReadIops(virCgroupPtr group,
* *
* Returns: 0 on success, -1 on error * Returns: 0 on success, -1 on error
*/ */
int static int
virCgroupGetBlkioDeviceWriteIops(virCgroupPtr group, virCgroupGetBlkioDeviceWriteIops(virCgroupPtr group,
const char *path, const char *path,
unsigned int *wiops) unsigned int *wiops)
@ -1538,7 +1538,7 @@ virCgroupGetBlkioDeviceWriteIops(virCgroupPtr group,
* *
* Returns: 0 on success, -1 on error * Returns: 0 on success, -1 on error
*/ */
int static int
virCgroupGetBlkioDeviceReadBps(virCgroupPtr group, virCgroupGetBlkioDeviceReadBps(virCgroupPtr group,
const char *path, const char *path,
unsigned long long *rbps) unsigned long long *rbps)
@ -1555,7 +1555,7 @@ virCgroupGetBlkioDeviceReadBps(virCgroupPtr group,
* *
* Returns: 0 on success, -1 on error * Returns: 0 on success, -1 on error
*/ */
int static int
virCgroupGetBlkioDeviceWriteBps(virCgroupPtr group, virCgroupGetBlkioDeviceWriteBps(virCgroupPtr group,
const char *path, const char *path,
unsigned long long *wbps) unsigned long long *wbps)
@ -1572,7 +1572,7 @@ virCgroupGetBlkioDeviceWriteBps(virCgroupPtr group,
* *
* Returns: 0 on success, -1 on error * Returns: 0 on success, -1 on error
*/ */
int static int
virCgroupGetBlkioDeviceWeight(virCgroupPtr group, virCgroupGetBlkioDeviceWeight(virCgroupPtr group,
const char *path, const char *path,
unsigned int *weight) unsigned int *weight)
@ -2993,7 +2993,7 @@ virCgroupGetBlkioWeight(virCgroupPtr group G_GNUC_UNUSED,
} }
int static int
virCgroupSetBlkioDeviceWeight(virCgroupPtr group G_GNUC_UNUSED, virCgroupSetBlkioDeviceWeight(virCgroupPtr group G_GNUC_UNUSED,
const char *path G_GNUC_UNUSED, const char *path G_GNUC_UNUSED,
unsigned int weight G_GNUC_UNUSED) unsigned int weight G_GNUC_UNUSED)
@ -3003,7 +3003,7 @@ virCgroupSetBlkioDeviceWeight(virCgroupPtr group G_GNUC_UNUSED,
return -1; return -1;
} }
int static int
virCgroupSetBlkioDeviceReadIops(virCgroupPtr group G_GNUC_UNUSED, virCgroupSetBlkioDeviceReadIops(virCgroupPtr group G_GNUC_UNUSED,
const char *path G_GNUC_UNUSED, const char *path G_GNUC_UNUSED,
unsigned int riops G_GNUC_UNUSED) unsigned int riops G_GNUC_UNUSED)
@ -3013,7 +3013,7 @@ virCgroupSetBlkioDeviceReadIops(virCgroupPtr group G_GNUC_UNUSED,
return -1; return -1;
} }
int static int
virCgroupSetBlkioDeviceWriteIops(virCgroupPtr group G_GNUC_UNUSED, virCgroupSetBlkioDeviceWriteIops(virCgroupPtr group G_GNUC_UNUSED,
const char *path G_GNUC_UNUSED, const char *path G_GNUC_UNUSED,
unsigned int wiops G_GNUC_UNUSED) unsigned int wiops G_GNUC_UNUSED)
@ -3023,7 +3023,7 @@ virCgroupSetBlkioDeviceWriteIops(virCgroupPtr group G_GNUC_UNUSED,
return -1; return -1;
} }
int static int
virCgroupSetBlkioDeviceReadBps(virCgroupPtr group G_GNUC_UNUSED, virCgroupSetBlkioDeviceReadBps(virCgroupPtr group G_GNUC_UNUSED,
const char *path G_GNUC_UNUSED, const char *path G_GNUC_UNUSED,
unsigned long long rbps G_GNUC_UNUSED) unsigned long long rbps G_GNUC_UNUSED)
@ -3033,7 +3033,7 @@ virCgroupSetBlkioDeviceReadBps(virCgroupPtr group G_GNUC_UNUSED,
return -1; return -1;
} }
int static int
virCgroupSetBlkioDeviceWriteBps(virCgroupPtr group G_GNUC_UNUSED, virCgroupSetBlkioDeviceWriteBps(virCgroupPtr group G_GNUC_UNUSED,
const char *path G_GNUC_UNUSED, const char *path G_GNUC_UNUSED,
unsigned long long wbps G_GNUC_UNUSED) unsigned long long wbps G_GNUC_UNUSED)
@ -3043,7 +3043,7 @@ virCgroupSetBlkioDeviceWriteBps(virCgroupPtr group G_GNUC_UNUSED,
return -1; return -1;
} }
int static int
virCgroupGetBlkioDeviceWeight(virCgroupPtr group G_GNUC_UNUSED, virCgroupGetBlkioDeviceWeight(virCgroupPtr group G_GNUC_UNUSED,
const char *path G_GNUC_UNUSED, const char *path G_GNUC_UNUSED,
unsigned int *weight G_GNUC_UNUSED) unsigned int *weight G_GNUC_UNUSED)
@ -3053,7 +3053,7 @@ virCgroupGetBlkioDeviceWeight(virCgroupPtr group G_GNUC_UNUSED,
return -1; return -1;
} }
int static int
virCgroupGetBlkioDeviceReadIops(virCgroupPtr group G_GNUC_UNUSED, virCgroupGetBlkioDeviceReadIops(virCgroupPtr group G_GNUC_UNUSED,
const char *path G_GNUC_UNUSED, const char *path G_GNUC_UNUSED,
unsigned int *riops G_GNUC_UNUSED) unsigned int *riops G_GNUC_UNUSED)
@ -3063,7 +3063,7 @@ virCgroupGetBlkioDeviceReadIops(virCgroupPtr group G_GNUC_UNUSED,
return -1; return -1;
} }
int static int
virCgroupGetBlkioDeviceWriteIops(virCgroupPtr group G_GNUC_UNUSED, virCgroupGetBlkioDeviceWriteIops(virCgroupPtr group G_GNUC_UNUSED,
const char *path G_GNUC_UNUSED, const char *path G_GNUC_UNUSED,
unsigned int *wiops G_GNUC_UNUSED) unsigned int *wiops G_GNUC_UNUSED)
@ -3073,7 +3073,7 @@ virCgroupGetBlkioDeviceWriteIops(virCgroupPtr group G_GNUC_UNUSED,
return -1; return -1;
} }
int static int
virCgroupGetBlkioDeviceReadBps(virCgroupPtr group G_GNUC_UNUSED, virCgroupGetBlkioDeviceReadBps(virCgroupPtr group G_GNUC_UNUSED,
const char *path G_GNUC_UNUSED, const char *path G_GNUC_UNUSED,
unsigned long long *rbps G_GNUC_UNUSED) unsigned long long *rbps G_GNUC_UNUSED)
@ -3083,7 +3083,7 @@ virCgroupGetBlkioDeviceReadBps(virCgroupPtr group G_GNUC_UNUSED,
return -1; return -1;
} }
int static int
virCgroupGetBlkioDeviceWriteBps(virCgroupPtr group G_GNUC_UNUSED, virCgroupGetBlkioDeviceWriteBps(virCgroupPtr group G_GNUC_UNUSED,
const char *path G_GNUC_UNUSED, const char *path G_GNUC_UNUSED,
unsigned long long *wbps G_GNUC_UNUSED) unsigned long long *wbps G_GNUC_UNUSED)

40
src/util/vircgroup.h
View File

@ -135,46 +135,6 @@ int virCgroupGetBlkioIoDeviceServiced(virCgroupPtr group,
long long *requests_read, long long *requests_read,
long long *requests_write); long long *requests_write);
int virCgroupSetBlkioDeviceWeight(virCgroupPtr group,
const char *path,
unsigned int weight);
int virCgroupSetBlkioDeviceReadIops(virCgroupPtr group,
const char *path,
unsigned int riops);
int virCgroupSetBlkioDeviceWriteIops(virCgroupPtr group,
const char *path,
unsigned int wiops);
int virCgroupSetBlkioDeviceReadBps(virCgroupPtr group,
const char *path,
unsigned long long rbps);
int virCgroupSetBlkioDeviceWriteBps(virCgroupPtr group,
const char *path,
unsigned long long wbps);
int virCgroupGetBlkioDeviceWeight(virCgroupPtr group,
const char *path,
unsigned int *weight);
int virCgroupGetBlkioDeviceReadIops(virCgroupPtr group,
const char *path,
unsigned int *riops);
int virCgroupGetBlkioDeviceWriteIops(virCgroupPtr group,
const char *path,
unsigned int *wiops);
int virCgroupGetBlkioDeviceReadBps(virCgroupPtr group,
const char *path,
unsigned long long *rbps);
int virCgroupGetBlkioDeviceWriteBps(virCgroupPtr group,
const char *path,
unsigned long long *wbps);
int virCgroupSetupBlkioDeviceWeight(virCgroupPtr cgroup, int virCgroupSetupBlkioDeviceWeight(virCgroupPtr cgroup,
const char *path, const char *path,
unsigned int *weight); unsigned int *weight);