motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-09 02:24:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qga: Remove deprecated 'blacklist' argument / config key

Browse source 
The 'blacklist' argument / config key are deprecated since commit
582a098e6c ("qga: Replace 'blacklist' command line and config file
options by 'block-rpcs'"), time to remove them.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Message-Id: <20240530070413.19181-1-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-05-30 08:36:43 +02:00
parent 7ffc4894a6
commit a7a2d636ae
3 changed files with 18 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

18
docs/about/deprecated.rst
View file

@ -462,24 +462,6 @@ versions, aliases will point to newer CPU model versions
depending on the machine type, so management software must depending on the machine type, so management software must
resolve CPU model aliases before starting a virtual machine. resolve CPU model aliases before starting a virtual machine.
QEMU guest agent
----------------
``--blacklist`` command line option (since 7.2)
'''''''''''''''''''''''''''''''''''''''''''''''
``--blacklist`` has been replaced by ``--block-rpcs`` (which is a better
wording for what this option does). The short form ``-b`` still stays
the same and thus is the preferred way for scripts that should run with
both, older and future versions of QEMU.
``blacklist`` config file option (since 7.2)
''''''''''''''''''''''''''''''''''''''''''''
The ``blacklist`` config file option has been renamed to ``block-rpcs``
(to be in sync with the renaming of the corresponding command line
option).
Migration Migration
--------- ---------

18
docs/about/removed-features.rst
View file

@ -1144,4 +1144,22 @@ stable for some time and is now widely used.
The command line and feature set is very close to the removed The command line and feature set is very close to the removed
C implementation. C implementation.
QEMU guest agent
----------------
``--blacklist`` command line option (removed in 9.1)
''''''''''''''''''''''''''''''''''''''''''''''''''''
``--blacklist`` has been replaced by ``--block-rpcs`` (which is a better
wording for what this option does). The short form ``-b`` still stays
the same and thus is the preferred way for scripts that should run with
both, older and future versions of QEMU.
``blacklist`` config file option (removed in 9.1)
'''''''''''''''''''''''''''''''''''''''''''''''''
The ``blacklist`` config file option has been renamed to ``block-rpcs``
(to be in sync with the renaming of the corresponding command line
option).
.. _Intel discontinuance notification: https://www.intel.com/content/www/us/en/content-details/781327/intel-is-discontinuing-ip-ordering-codes-listed-in-pdn2312-for-nios-ii-ip.html .. _Intel discontinuance notification: https://www.intel.com/content/www/us/en/content-details/781327/intel-is-discontinuing-ip-ordering-codes-listed-in-pdn2312-for-nios-ii-ip.html

6
qga/main.c
View file

@ -1071,11 +1071,6 @@ static void config_load(GAConfig *config)
g_key_file_get_boolean(keyfile, "general", "retry-path", &gerr); 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, should be replaced"
" with the 'block-rpcs' key.");
blockrpcs_key = "blacklist";
}
if (g_key_file_has_key(keyfile, "general", blockrpcs_key, NULL)) { if (g_key_file_has_key(keyfile, "general", blockrpcs_key, NULL)) {
config->bliststr = config->bliststr =
g_key_file_get_string(keyfile, "general", blockrpcs_key, &gerr); g_key_file_get_string(keyfile, "general", blockrpcs_key, &gerr);
@ -1190,7 +1185,6 @@ static void config_parse(GAConfig *config, int argc, char **argv)
{ "path", 1, NULL, 'p' }, { "path", 1, NULL, 'p' },
{ "daemonize", 0, NULL, 'd' }, { "daemonize", 0, NULL, 'd' },
{ "block-rpcs", 1, NULL, 'b' }, { "block-rpcs", 1, NULL, 'b' },
{ "blacklist", 1, NULL, 'b' }, /* deprecated alias for 'block-rpcs' */
{ "allow-rpcs", 1, NULL, 'a' }, { "allow-rpcs", 1, NULL, 'a' },
#ifdef _WIN32 #ifdef _WIN32
{ "service", 1, NULL, 's' }, { "service", 1, NULL, 's' },