From: Konstantin Kostiuk <kkostiuk@redhat.com>
To: qemu-devel@nongnu.org, Peter Maydell <peter.maydell@linaro.org>,
Stefan Hajnoczi <stefanha@redhat.com>
Subject: [PULL v2 20/25] qga: remove pointless 'blockrpcs_key' variable
Date: Tue, 23 Jul 2024 10:02:46 +0300 [thread overview]
Message-ID: <20240723070251.25575-21-kkostiuk@redhat.com> (raw)
In-Reply-To: <20240723070251.25575-1-kkostiuk@redhat.com>
From: Daniel P. Berrangé <berrange@redhat.com>
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>
Message-ID: <20240712132459.3974109-21-berrange@redhat.com>
Signed-off-by: Konstantin Kostiuk <kkostiuk@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.2
next prev parent reply other threads:[~2024-07-23 7:04 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-23 7:02 [PULL v2 00/25] Misc QEMU-GA patches 2024-07-22 Konstantin Kostiuk
2024-07-23 7:02 ` [PULL v2 01/25] qga: drop blocking of guest-get-memory-block-size command Konstantin Kostiuk
2024-07-23 7:02 ` [PULL v2 02/25] qga: move linux vcpu command impls to commands-linux.c Konstantin Kostiuk
2024-07-23 7:02 ` [PULL v2 03/25] qga: move linux suspend " Konstantin Kostiuk
2024-07-23 7:02 ` [PULL v2 04/25] qga: move linux fs/disk " Konstantin Kostiuk
2024-07-23 7:02 ` [PULL v2 05/25] qga: move linux disk/cpu stats " Konstantin Kostiuk
2024-07-23 7:02 ` [PULL v2 06/25] qga: move linux memory block " Konstantin Kostiuk
2024-07-23 7:02 ` [PULL v2 07/25] qga: move CONFIG_FSFREEZE/TRIM to be meson defined options Konstantin Kostiuk
2024-07-23 7:02 ` [PULL v2 08/25] qga: conditionalize schema for commands unsupported on Windows Konstantin Kostiuk
2024-07-23 7:02 ` [PULL v2 09/25] qga: conditionalize schema for commands unsupported on non-Linux POSIX Konstantin Kostiuk
2024-07-23 7:02 ` [PULL v2 10/25] qga: conditionalize schema for commands requiring getifaddrs Konstantin Kostiuk
2024-07-23 7:02 ` [PULL v2 11/25] qga: conditionalize schema for commands requiring linux/win32 Konstantin Kostiuk
2024-07-23 7:02 ` [PULL v2 12/25] qga: conditionalize schema for commands only supported on Windows Konstantin Kostiuk
2024-07-23 7:02 ` [PULL v2 13/25] qga: conditionalize schema for commands requiring fsfreeze Konstantin Kostiuk
2024-07-23 7:02 ` [PULL v2 14/25] qga: conditionalize schema for commands requiring fstrim Konstantin Kostiuk
2024-07-23 7:02 ` [PULL v2 15/25] qga: conditionalize schema for commands requiring libudev Konstantin Kostiuk
2024-07-23 7:02 ` [PULL v2 16/25] qga: conditionalize schema for commands requiring utmpx Konstantin Kostiuk
2024-07-23 7:02 ` [PULL v2 17/25] qga: conditionalize schema for commands not supported on other UNIX Konstantin Kostiuk
2024-07-23 7:02 ` [PULL v2 18/25] qga: don't disable fsfreeze commands if vss_init fails Konstantin Kostiuk
2024-07-23 7:02 ` [PULL v2 19/25] qga: move declare of QGAConfig struct to top of file Konstantin Kostiuk
2024-07-23 7:02 ` Konstantin Kostiuk [this message]
2024-07-23 7:02 ` [PULL v2 21/25] qga: allow configuration file path via the cli Konstantin Kostiuk
2024-07-23 7:02 ` [PULL v2 22/25] qga: centralize logic for disabling/enabling commands Konstantin Kostiuk
2024-07-23 7:02 ` [PULL v2 23/25] qga/commands-posix: Make ga_wait_child() return boolean Konstantin Kostiuk
2024-07-23 7:02 ` [PULL v2 24/25] guest-agent: document allow-rpcs in config file section Konstantin Kostiuk
2024-07-23 7:02 ` [PULL v2 25/25] qga/linux: Add new api 'guest-network-get-route' Konstantin Kostiuk
2024-07-25 10:12 ` Peter Maydell
2024-07-29 7:40 ` Konstantin Kostiuk
2024-07-29 9:35 ` Peter Maydell
2024-08-15 14:17 ` Peter Maydell
2024-08-19 7:07 ` Konstantin Kostiuk
2024-07-23 23:17 ` [PULL v2 00/25] Misc QEMU-GA patches 2024-07-22 Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240723070251.25575-21-kkostiuk@redhat.com \
--to=kkostiuk@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).