External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-30 09:53:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: rename method to virKModIsProhibited

Browse Source 
This new naming matches the terminology used in the error
messages that the callers report.

Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2020-06-16 12:12:09 +01:00
parent bec026145d
commit e8645610c8
5 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libvirt_private.syms
View File

@ -2402,7 +2402,7 @@ virKeycodeValueTranslate;
# util/virkmod.h # util/virkmod.h
virKModIsBlacklisted; virKModIsProhibited;
virKModLoad; virKModLoad;
virKModUnload; virKModUnload;

2
src/util/virfile.c
View File

@ -897,7 +897,7 @@ virFileNBDDeviceFindUnused(void)
static bool static bool
virFileNBDLoadDriver(void) virFileNBDLoadDriver(void)
{ {
if (virKModIsBlacklisted(NBD_DRIVER)) { if (virKModIsProhibited(NBD_DRIVER)) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Failed to load nbd module: " _("Failed to load nbd module: "
"administratively prohibited")); "administratively prohibited"));

24
src/util/virkmod.c
View File

@ -112,32 +112,32 @@ virKModUnload(const char *module)
/** /**
* virKModIsBlacklisted: * virKModIsProhibited:
* @module: Name of the module to check for on the blacklist * @module: Name of the module to check
* *
* Search the output of the configuration data for the module being * Determine if loading of @module is prohibited by admin
* blacklisted. * configuration.
* *
* returns true when found blacklisted, false otherwise. * returns true when found prohibited, false otherwise.
*/ */
bool bool
virKModIsBlacklisted(const char *module) virKModIsProhibited(const char *module)
{ {
size_t i; size_t i;
g_autofree char *drvblklst = NULL; g_autofree char *drvmatch = NULL;
g_autofree char *outbuf = NULL; g_autofree char *outbuf = NULL;
drvblklst = g_strdup_printf("blacklist %s\n", module); drvmatch = g_strdup_printf("blacklist %s\n", module);
/* modprobe will convert all '-' into '_', so we need to as well */ /* modprobe will convert all '-' into '_', so we need to as well */
for (i = 0; i < drvblklst[i]; i++) for (i = 0; i < drvmatch[i]; i++)
if (drvblklst[i] == '-') if (drvmatch[i] == '-')
drvblklst[i] = '_'; drvmatch[i] = '_';
if (doModprobe("-c", NULL, &outbuf, NULL) < 0) if (doModprobe("-c", NULL, &outbuf, NULL) < 0)
return false; return false;
if (strstr(outbuf, drvblklst)) if (strstr(outbuf, drvmatch))
return true; return true;
return false; return false;

2
src/util/virkmod.h
View File

@ -27,5 +27,5 @@ char *virKModLoad(const char *)
ATTRIBUTE_NONNULL(1); ATTRIBUTE_NONNULL(1);
char *virKModUnload(const char *) char *virKModUnload(const char *)
ATTRIBUTE_NONNULL(1); ATTRIBUTE_NONNULL(1);
bool virKModIsBlacklisted(const char *) bool virKModIsProhibited(const char *)
ATTRIBUTE_NONNULL(1); ATTRIBUTE_NONNULL(1);

4
src/util/virpci.c
View File

@ -1023,10 +1023,10 @@ virPCIProbeStubDriver(virPCIStubDriver driver)
} }
cleanup: cleanup:
/* If we know failure was because of blacklist, let's report that; /* If we know failure was because of admin config, let's report that;
* otherwise, report a more generic failure message * otherwise, report a more generic failure message
*/ */
if (virKModIsBlacklisted(drvname)) { if (virKModIsProhibited(drvname)) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
_("Failed to load PCI stub module %s: " _("Failed to load PCI stub module %s: "
"administratively prohibited"), "administratively prohibited"),