On 11/20/2015 05:00 AM, Ján Tomko wrote:
Many of the functions follow the pattern: virSecurity.*Security.*Label
Remove the second 'Security' from the names, it should be obvious that the virSecurity* functions deal with security labels even without it. --- src/security/security_dac.c | 240 ++++++++++++++++++++-------------------- src/security/security_selinux.c | 188 +++++++++++++++---------------- 2 files changed, 214 insertions(+), 214 deletions(-)
A "grep ^virSecurity.*Security.*Label src/security/*.c | grep -v virSecurityLabel | cut -d: -f2 | cut -d\( -f1 | sort | uniq -i" turns up more instances in _selinux as well as _stack: virSecuritySELinuxRestoreSecurityChardevLabel virSecuritySELinuxRestoreSecurityFileLabel virSecuritySELinuxRestoreSecurityHostdevCapsLabel virSecuritySELinuxRestoreSecurityHostdevSubsysLabel virSecuritySELinuxRestoreSecurityPCILabel virSecuritySELinuxRestoreSecuritySCSILabel virSecuritySELinuxRestoreSecurityTPMFileLabelInt virSecuritySELinuxRestoreSecurityUSBLabel virSecuritySELinuxSetSecurityChardevLabel virSecuritySELinuxSetSecurityHostdevCapsLabel virSecuritySELinuxSetSecurityHostdevSubsysLabel virSecuritySELinuxSetSecurityPCILabel virSecuritySELinuxSetSecuritySCSILabel virSecuritySELinuxSetSecurityTPMFileLabel virSecuritySELinuxSetSecurityUSBLabel virSecurityStackRestoreSecurityAllLabel virSecurityStackRestoreSecurityDiskLabel virSecurityStackRestoreSecurityHostdevLabel virSecurityStackRestoreSecurityImageLabel virSecurityStackSetSecurityAllLabel virSecurityStackSetSecurityDiskLabel virSecurityStackSetSecurityHostdevLabel virSecurityStackSetSecurityImageLabel I would say ACK for _dac, but _selinux still needs some work and _stack was not changed (whether that's intentional or not)... Perhaps split them into separate patches too. John [...]