[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 19/22] qga: move declare of QGAConfig struct to top of file
From: |
Daniel P . Berrangé |
Subject: |
[PATCH v3 19/22] qga: move declare of QGAConfig struct to top of file |
Date: |
Fri, 12 Jul 2024 14:24:56 +0100 |
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>
---
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.1
- [PATCH v3 09/22] qga: conditionalize schema for commands unsupported on non-Linux POSIX, (continued)
- [PATCH v3 09/22] qga: conditionalize schema for commands unsupported on non-Linux POSIX, Daniel P . Berrangé, 2024/07/12
- [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é <=
- [PATCH v3 20/22] qga: remove pointless 'blockrpcs_key' variable, Daniel P . Berrangé, 2024/07/12
- [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