Reviewed-by: Konstantin Kostiuk <kkost...@redhat.com> On Thu, Jun 13, 2024 at 6:44 PM Daniel P. Berrangé <berra...@redhat.com> wrote:
> 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. > > Signed-off-by: Daniel P. Berrangé <berra...@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 > >