1. Patchew
  2. Libvirt
  3. View series

[PATCH] qga: Remove deprecated 'blacklist' argument / config key

Philippe Mathieu-Daudé posted 1 patch 3 months, 1 week ago
Failed in applying to current master (apply log)
There is a newer version of this series
docs/about/deprecated.rst       | 18 ------------------
docs/about/removed-features.rst | 18 ++++++++++++++++++
qga/main.c                      |  6 ------
3 files changed, 18 insertions(+), 24 deletions(-)
[PATCH] qga: Remove deprecated 'blacklist' argument / config key
Posted by Philippe Mathieu-Daudé 3 months, 1 week ago 
The 'blacklist' argument / config key are deprecated since commi
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>
---
 docs/about/deprecated.rst       | 18 ------------------
 docs/about/removed-features.rst | 18 ++++++++++++++++++
 qga/main.c                      |  6 ------
 3 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index 40585ca7d5..a32e0e2564 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -478,24 +478,6 @@ versions, aliases will point to newer CPU model versions
 depending on the machine type, so management software must
 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
 ---------
 
diff --git a/docs/about/removed-features.rst b/docs/about/removed-features.rst
index fba0cfb0b0..deca066b21 100644
--- a/docs/about/removed-features.rst
+++ b/docs/about/removed-features.rst
@@ -1129,4 +1129,22 @@ stable for some time and is now widely used.
 The command line and feature set is very close to the removed
 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
diff --git a/qga/main.c b/qga/main.c
index bdf5344584..f4d5f15bb3 100644
--- a/qga/main.c
+++ b/qga/main.c
@@ -1071,11 +1071,6 @@ static void config_load(GAConfig *config)
             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)) {
         config->bliststr =
             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' },
         { "daemonize", 0, NULL, 'd' },
         { "block-rpcs", 1, NULL, 'b' },
-        { "blacklist", 1, NULL, 'b' },  /* deprecated alias for 'block-rpcs' */
         { "allow-rpcs", 1, NULL, 'a' },
 #ifdef _WIN32
         { "service", 1, NULL, 's' },
-- 
2.41.0
Re: [PATCH] qga: Remove deprecated 'blacklist' argument / config key
Posted by Philippe Mathieu-Daudé 3 months ago 
On 30/5/24 09:04, Philippe Mathieu-Daudé wrote:
> The 'blacklist' argument / config key are deprecated since commi

Typo "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>
> ---
>   docs/about/deprecated.rst       | 18 ------------------
>   docs/about/removed-features.rst | 18 ++++++++++++++++++
>   qga/main.c                      |  6 ------
>   3 files changed, 18 insertions(+), 24 deletions(-)
Re: [PATCH] qga: Remove deprecated 'blacklist' argument / config key
Posted by Philippe Mathieu-Daudé 3 months ago 
On 3/6/24 13:23, Philippe Mathieu-Daudé wrote:
> On 30/5/24 09:04, Philippe Mathieu-Daudé wrote:
>> The 'blacklist' argument / config key are deprecated since commi
> 
> Typo "commit".

Fixed while applying, thanks.

>> 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>
>> ---
>>   docs/about/deprecated.rst       | 18 ------------------
>>   docs/about/removed-features.rst | 18 ++++++++++++++++++
>>   qga/main.c                      |  6 ------
>>   3 files changed, 18 insertions(+), 24 deletions(-)
>
Re: [PATCH] qga: Remove deprecated 'blacklist' argument / config key
Posted by Konstantin Kostiuk 3 months, 1 week ago 
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>



On Thu, May 30, 2024 at 10:04 AM Philippe Mathieu-Daudé <philmd@linaro.org>
wrote:

> The 'blacklist' argument / config key are deprecated since commi
> 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>
> ---
>  docs/about/deprecated.rst       | 18 ------------------
>  docs/about/removed-features.rst | 18 ++++++++++++++++++
>  qga/main.c                      |  6 ------
>  3 files changed, 18 insertions(+), 24 deletions(-)
>
> diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
> index 40585ca7d5..a32e0e2564 100644
> --- a/docs/about/deprecated.rst
> +++ b/docs/about/deprecated.rst
> @@ -478,24 +478,6 @@ versions, aliases will point to newer CPU model
> versions
>  depending on the machine type, so management software must
>  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
>  ---------
>
> diff --git a/docs/about/removed-features.rst
> b/docs/about/removed-features.rst
> index fba0cfb0b0..deca066b21 100644
> --- a/docs/about/removed-features.rst
> +++ b/docs/about/removed-features.rst
> @@ -1129,4 +1129,22 @@ stable for some time and is now widely used.
>  The command line and feature set is very close to the removed
>  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
> diff --git a/qga/main.c b/qga/main.c
> index bdf5344584..f4d5f15bb3 100644
> --- a/qga/main.c
> +++ b/qga/main.c
> @@ -1071,11 +1071,6 @@ static void config_load(GAConfig *config)
>              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)) {
>          config->bliststr =
>              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' },
>          { "daemonize", 0, NULL, 'd' },
>          { "block-rpcs", 1, NULL, 'b' },
> -        { "blacklist", 1, NULL, 'b' },  /* deprecated alias for
> 'block-rpcs' */
>          { "allow-rpcs", 1, NULL, 'a' },
>  #ifdef _WIN32
>          { "service", 1, NULL, 's' },
> --
> 2.41.0
>
>

Patchew 2.1-devel-b67e4c2

© 2016 - 2024 Red Hat, Inc.