On Tue, Feb 02, 2021 at 09:58:15PM +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.
>
> Keep the --blacklist available for backward compatibility.
>
> [*] 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 | 6 ++++--
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/docs/interop/qemu-ga.rst b/docs/interop/qemu-ga.rst
> index 9a590bf95cb..89596e646de 100644
> --- a/docs/interop/qemu-ga.rst
> +++ b/docs/interop/qemu-ga.rst
> @@ -79,7 +79,7 @@ Options
>
> Daemonize after startup (detach from terminal).
>
> -.. option:: -b, --blacklist=LIST
> +.. option:: -b, --denylist=LIST
>
> Comma-separated list of RPCs to disable (no spaces, ``?`` to list
> available RPCs).
> diff --git a/qga/main.c b/qga/main.c
> index 249fe06e8e5..66177b9e93d 100644
> --- a/qga/main.c
> +++ b/qga/main.c
> @@ -257,7 +257,8 @@ QEMU_COPYRIGHT "\n"
> #ifdef _WIN32
> " -s, --service service commands: install, uninstall, vss-install,
> vss-uninstall\n"
> #endif
> -" -b, --blacklist comma-separated list of RPCs to disable (no spaces,
> \"?\"\n"
> +" --blacklist backward compatible alias for --denylist (deprecated)\n"
> +" -b, --denylist comma-separated list of RPCs to disable (no spaces,
> \"?\"\n"
"-b" is a bit odd as a short name now, but i guess that's not the end
of the world.
The deprecation should be documented though. Ideally we would report
a warning if the deprecated long arg was used too.
> " to list available RPCs)\n"
> " -D, --dump-conf dump a qemu-ga config file based on current config\n"
> " options / command-line parameters to stdout\n"
> @@ -1111,7 +1112,8 @@ static void config_parse(GAConfig *config, int argc,
> char **argv)
> { "method", 1, NULL, 'm' },
> { "path", 1, NULL, 'p' },
> { "daemonize", 0, NULL, 'd' },
> - { "blacklist", 1, NULL, 'b' },
> + { "denylist", 1, NULL, 'b' },
> + { "blacklist", 1, NULL, 'b' }, /* deprecated alias for 'denylist' */
> #ifdef _WIN32
> { "service", 1, NULL, 's' },
> #endif
> --
> 2.26.2
>
>
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 :|
