diff mbox series

[v2,20/22] qga: remove pointless 'blockrpcs_key' variable

Message ID 20240613154406.1365469-15-berrange@redhat.com
State New
Headers show
Series qga: clean up command source locations and conditionals | expand

Commit Message

Daniel P. Berrangé June 13, 2024, 3:44 p.m. UTC 
This variable was used to support back compat for the old config
file key name, and became redundant after the following change:

  commit a7a2d636ae4549ef0551134d4bf8e084a14431c4
  Author: Philippe Mathieu-Daudé <philmd@linaro.org>
  Date:   Thu May 30 08:36:43 2024 +0200

    qga: Remove deprecated 'blacklist' argument / config key

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 qga/main.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

Comments

Philippe Mathieu-Daudé July 3, 2024, 8:41 a.m. UTC | #1 
On 13/6/24 17:44, Daniel P. Berrangé wrote:
> This variable was used to support back compat for the old config
> file key name, and became redundant after the following change:
> 
>    commit a7a2d636ae4549ef0551134d4bf8e084a14431c4
>    Author: Philippe Mathieu-Daudé <philmd@linaro.org>
>    Date:   Thu May 30 08:36:43 2024 +0200
> 
>      qga: Remove deprecated 'blacklist' argument / config key
> 
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>   qga/main.c | 7 +++----
>   1 file changed, 3 insertions(+), 4 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Konstantin Kostiuk July 12, 2024, 8:46 a.m. UTC | #2 
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>

On Thu, Jun 13, 2024 at 6:45 PM Daniel P. Berrangé <berrange@redhat.com>
wrote:

> This variable was used to support back compat for the old config
> file key name, and became redundant after the following change:
>
>   commit a7a2d636ae4549ef0551134d4bf8e084a14431c4
>   Author: Philippe Mathieu-Daudé <philmd@linaro.org>
>   Date:   Thu May 30 08:36:43 2024 +0200
>
>     qga: Remove deprecated 'blacklist' argument / config key
>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
>  qga/main.c | 7 +++----
>  1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/qga/main.c b/qga/main.c
> index 647d27037c..6ff022a85d 100644
> --- a/qga/main.c
> +++ b/qga/main.c
> @@ -1023,7 +1023,6 @@ 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 *blockrpcs_key = "block-rpcs";
>
>      /* read system config */
>      keyfile = g_key_file_new();
> @@ -1071,9 +1070,9 @@ static void config_load(GAConfig *config)
>              g_key_file_get_boolean(keyfile, "general", "retry-path",
> &gerr);
>      }
>
> -    if (g_key_file_has_key(keyfile, "general", blockrpcs_key, NULL)) {
> +    if (g_key_file_has_key(keyfile, "general", "block-rpcs", NULL)) {
>          config->bliststr =
> -            g_key_file_get_string(keyfile, "general", blockrpcs_key,
> &gerr);
> +            g_key_file_get_string(keyfile, "general", "block-rpcs",
> &gerr);
>          config->blockedrpcs = g_list_concat(config->blockedrpcs,
>                                            split_list(config->bliststr,
> ","));
>      }
> @@ -1084,7 +1083,7 @@ static void config_load(GAConfig *config)
>                                            split_list(config->aliststr,
> ","));
>      }
>
> -    if (g_key_file_has_key(keyfile, "general", blockrpcs_key, NULL) &&
> +    if (g_key_file_has_key(keyfile, "general", "block-rpcs", NULL) &&
>          g_key_file_has_key(keyfile, "general", "allow-rpcs", NULL)) {
>          g_critical("wrong config, using 'block-rpcs' and 'allow-rpcs'
> keys at"
>                     " the same time is not allowed");
> --
> 2.45.1
>
>
diff mbox series

Patch

diff --git a/qga/main.c b/qga/main.c
index 647d27037c..6ff022a85d 100644
--- a/qga/main.c
+++ b/qga/main.c
@@ -1023,7 +1023,6 @@  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 *blockrpcs_key = "block-rpcs";
 
     /* read system config */
     keyfile = g_key_file_new();
@@ -1071,9 +1070,9 @@  static void config_load(GAConfig *config)
             g_key_file_get_boolean(keyfile, "general", "retry-path", &gerr);
     }
 
-    if (g_key_file_has_key(keyfile, "general", blockrpcs_key, NULL)) {
+    if (g_key_file_has_key(keyfile, "general", "block-rpcs", NULL)) {
         config->bliststr =
-            g_key_file_get_string(keyfile, "general", blockrpcs_key, &gerr);
+            g_key_file_get_string(keyfile, "general", "block-rpcs", &gerr);
         config->blockedrpcs = g_list_concat(config->blockedrpcs,
                                           split_list(config->bliststr, ","));
     }
@@ -1084,7 +1083,7 @@  static void config_load(GAConfig *config)
                                           split_list(config->aliststr, ","));
     }
 
-    if (g_key_file_has_key(keyfile, "general", blockrpcs_key, NULL) &&
+    if (g_key_file_has_key(keyfile, "general", "block-rpcs", NULL) &&
         g_key_file_has_key(keyfile, "general", "allow-rpcs", NULL)) {
         g_critical("wrong config, using 'block-rpcs' and 'allow-rpcs' keys at"
                    " the same time is not allowed");