[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 19/25] qga: move declare of QGAConfig struct to top of file
From: |
Konstantin Kostiuk |
Subject: |
[PULL v2 19/25] qga: move declare of QGAConfig struct to top of file |
Date: |
Tue, 23 Jul 2024 10:02:45 +0300 |
From: Daniel P. Berrangé <berrange@redhat.com>
It is referenced by QGAState already, and it is clearer to declare all
data types at the top of the file, rather than have them mixed with
code later.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
Message-ID: <20240712132459.3974109-20-berrange@redhat.com>
Signed-off-by: Konstantin Kostiuk <kkostiuk@redhat.com>
---
qga/main.c | 44 ++++++++++++++++++++++----------------------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/qga/main.c b/qga/main.c
index 17b6ce18ac..647d27037c 100644
--- a/qga/main.c
+++ b/qga/main.c
@@ -70,6 +70,28 @@ typedef struct GAPersistentState {
typedef struct GAConfig GAConfig;
+struct GAConfig {
+ char *channel_path;
+ char *method;
+ char *log_filepath;
+ char *pid_filepath;
+#ifdef CONFIG_FSFREEZE
+ char *fsfreeze_hook;
+#endif
+ char *state_dir;
+#ifdef _WIN32
+ const char *service;
+#endif
+ gchar *bliststr; /* blockedrpcs may point to this string */
+ gchar *aliststr; /* allowedrpcs may point to this string */
+ GList *blockedrpcs;
+ GList *allowedrpcs;
+ int daemonize;
+ GLogLevelFlags log_level;
+ int dumpconf;
+ bool retry_path;
+};
+
struct GAState {
JSONMessageParser parser;
GMainLoop *main_loop;
@@ -996,28 +1018,6 @@ static GList *split_list(const gchar *str, const gchar
*delim)
return list;
}
-struct GAConfig {
- char *channel_path;
- char *method;
- char *log_filepath;
- char *pid_filepath;
-#ifdef CONFIG_FSFREEZE
- char *fsfreeze_hook;
-#endif
- char *state_dir;
-#ifdef _WIN32
- const char *service;
-#endif
- gchar *bliststr; /* blockedrpcs may point to this string */
- gchar *aliststr; /* allowedrpcs may point to this string */
- GList *blockedrpcs;
- GList *allowedrpcs;
- int daemonize;
- GLogLevelFlags log_level;
- int dumpconf;
- bool retry_path;
-};
-
static void config_load(GAConfig *config)
{
GError *gerr = NULL;
--
2.45.2
- [PULL v2 09/25] qga: conditionalize schema for commands unsupported on non-Linux POSIX, (continued)
- [PULL v2 09/25] qga: conditionalize schema for commands unsupported on non-Linux POSIX, Konstantin Kostiuk, 2024/07/23
- [PULL v2 08/25] qga: conditionalize schema for commands unsupported on Windows, Konstantin Kostiuk, 2024/07/23
- [PULL v2 10/25] qga: conditionalize schema for commands requiring getifaddrs, Konstantin Kostiuk, 2024/07/23
- [PULL v2 11/25] qga: conditionalize schema for commands requiring linux/win32, Konstantin Kostiuk, 2024/07/23
- [PULL v2 12/25] qga: conditionalize schema for commands only supported on Windows, Konstantin Kostiuk, 2024/07/23
- [PULL v2 13/25] qga: conditionalize schema for commands requiring fsfreeze, Konstantin Kostiuk, 2024/07/23
- [PULL v2 14/25] qga: conditionalize schema for commands requiring fstrim, Konstantin Kostiuk, 2024/07/23
- [PULL v2 15/25] qga: conditionalize schema for commands requiring libudev, Konstantin Kostiuk, 2024/07/23
- [PULL v2 17/25] qga: conditionalize schema for commands not supported on other UNIX, Konstantin Kostiuk, 2024/07/23
- [PULL v2 16/25] qga: conditionalize schema for commands requiring utmpx, Konstantin Kostiuk, 2024/07/23
- [PULL v2 19/25] qga: move declare of QGAConfig struct to top of file,
Konstantin Kostiuk <=
- [PULL v2 18/25] qga: don't disable fsfreeze commands if vss_init fails, Konstantin Kostiuk, 2024/07/23
- [PULL v2 20/25] qga: remove pointless 'blockrpcs_key' variable, Konstantin Kostiuk, 2024/07/23
- [PULL v2 24/25] guest-agent: document allow-rpcs in config file section, Konstantin Kostiuk, 2024/07/23
- [PULL v2 23/25] qga/commands-posix: Make ga_wait_child() return boolean, Konstantin Kostiuk, 2024/07/23
- [PULL v2 22/25] qga: centralize logic for disabling/enabling commands, Konstantin Kostiuk, 2024/07/23
- [PULL v2 25/25] qga/linux: Add new api 'guest-network-get-route', Konstantin Kostiuk, 2024/07/23
- [PULL v2 21/25] qga: allow configuration file path via the cli, Konstantin Kostiuk, 2024/07/23