On Tue, Feb 02, 2021 at 09:58:14PM +0100, Philippe Mathieu-Daudé wrote: > Follow the inclusive terminology from the "Conscious Language in your > Open Source Projects" guidelines [*] and replace the word "blacklist" > appropriately. > > [*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md > > Signed-off-by: Philippe Mathieu-Daudé <phi...@redhat.com> > --- > docs/interop/qemu-ga.rst | 2 +- > qga/main.c | 15 +++++++++++---- > tests/test-qga.c | 8 ++++---- > tests/data/test-qga-config | 2 +- > 4 files changed, 17 insertions(+), 10 deletions(-)
Reviewed-by: Daniel P. Berrangé <berra...@redhat.com> > > diff --git a/docs/interop/qemu-ga.rst b/docs/interop/qemu-ga.rst > index 3063357bb5d..9a590bf95cb 100644 > --- a/docs/interop/qemu-ga.rst > +++ b/docs/interop/qemu-ga.rst > @@ -125,7 +125,7 @@ pidfile string > fsfreeze-hook string > statedir string > verbose boolean > -blacklist string list > +denylist string list > ============= =========== > > See also > diff --git a/qga/main.c b/qga/main.c > index e7f8f3b1616..249fe06e8e5 100644 > --- a/qga/main.c > +++ b/qga/main.c > @@ -962,6 +962,7 @@ static void config_load(GAConfig *config) > GError *gerr = NULL; > GKeyFile *keyfile; > g_autofree char *conf = g_strdup(g_getenv("QGA_CONF")) ?: > get_relocated_path(QGA_CONF_DEFAULT); > + const gchar *denylist_key = "denylist"; > > /* read system config */ > keyfile = g_key_file_new(); > @@ -1008,10 +1009,16 @@ static void config_load(GAConfig *config) > config->retry_path = > g_key_file_get_boolean(keyfile, "general", "retry-path", &gerr); > } > + > if (g_key_file_has_key(keyfile, "general", "blacklist", NULL)) { > + g_warning("config using deprecated 'blacklist' key, now replaced" > + " by the 'denylist' key."); We should document the config file option deprecation in the norma place for deprecations. > + denylist_key = "blacklist"; > + } Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|