[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 20/22] qga: remove pointless 'blockrpcs_key' variable
From: |
Daniel P . Berrangé |
Subject: |
[PATCH v3 20/22] qga: remove pointless 'blockrpcs_key' variable |
Date: |
Fri, 12 Jul 2024 14:24:57 +0100 |
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
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
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
- [PATCH v3 11/22] qga: conditionalize schema for commands requiring linux/win32, (continued)
- [PATCH v3 11/22] qga: conditionalize schema for commands requiring linux/win32, Daniel P . Berrangé, 2024/07/12
- [PATCH v3 12/22] qga: conditionalize schema for commands only supported on Windows, Daniel P . Berrangé, 2024/07/12
- [PATCH v3 13/22] qga: conditionalize schema for commands requiring fsfreeze, Daniel P . Berrangé, 2024/07/12
- [PATCH v3 15/22] qga: conditionalize schema for commands requiring libudev, Daniel P . Berrangé, 2024/07/12
- [PATCH v3 16/22] qga: conditionalize schema for commands requiring utmpx, Daniel P . Berrangé, 2024/07/12
- [PATCH v3 10/22] qga: conditionalize schema for commands requiring getifaddrs, Daniel P . Berrangé, 2024/07/12
- [PATCH v3 17/22] qga: conditionalize schema for commands not supported on other UNIX, Daniel P . Berrangé, 2024/07/12
- [PATCH v3 14/22] qga: conditionalize schema for commands requiring fstrim, Daniel P . Berrangé, 2024/07/12
- [PATCH v3 19/22] qga: move declare of QGAConfig struct to top of file, Daniel P . Berrangé, 2024/07/12
- [PATCH v3 20/22] qga: remove pointless 'blockrpcs_key' variable,
Daniel P . Berrangé <=
- [PATCH v3 21/22] qga: allow configuration file path via the cli, Daniel P . Berrangé, 2024/07/12
- [PATCH v3 18/22] qga: don't disable fsfreeze commands if vss_init fails, Daniel P . Berrangé, 2024/07/12
- [PATCH v3 22/22] qga: centralize logic for disabling/enabling commands, Daniel P . Berrangé, 2024/07/12