haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

qga: hang GAConfig/socket_activation off of GAState global

Browse source 
For w32 services we rely on the global GAState to access resources
associated with the agent within service_main(). Currently this is
sufficient for starting the agent since we open the channel once prior
to calling service_main(), and simply start the GMainLoop to start the
agent from within service_main().

Eventually we want to be able to also [re-]open the communication
channel from within service_main(), which requires access to
config/socket_activation variables, so we hang them off GAState in
preparation for that.

Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Sameeh Jubran <sameeh@daynix.com>
*dont move GAConfig struct, just the typedef
*fix build bisect for w32
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Michael Roth 2018-10-07 14:02:18 +03:00
parent 50d5b3c465
commit 0f4d3a4912
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
qga/main.c
View file

@ -69,6 +69,8 @@ typedef struct GAPersistentState {
int64_t fd_counter;
} GAPersistentState;
typedef struct GAConfig GAConfig;
struct GAState {
JSONMessageParser parser;
GMainLoop *main_loop;
@ -94,6 +96,8 @@ struct GAState {
#endif
gchar *pstate_filepath;
GAPersistentState pstate;
GAConfig *config;
int socket_activation;
};
struct GAState *ga_state;
@ -905,7 +909,7 @@ static GList *split_list(const gchar *str, const gchar *delim)
return list;
}
typedef struct GAConfig {
struct GAConfig {
char *channel_path;
char *method;
char *log_filepath;
@ -922,7 +926,7 @@ typedef struct GAConfig {
int daemonize;
GLogLevelFlags log_level;
int dumpconf;
} GAConfig;
};
static void config_load(GAConfig *config)
{
@ -1211,7 +1215,7 @@ static bool check_is_frozen(GAState *s)
return false;
}
static GAState *initialize_agent(GAConfig *config)
static GAState *initialize_agent(GAConfig *config, int socket_activation)
{
GAState *s = g_new0(GAState, 1);
@ -1304,6 +1308,8 @@ static GAState *initialize_agent(GAConfig *config)
s->main_loop = g_main_loop_new(NULL, false);
s->config = config;
s->socket_activation = socket_activation;
ga_state = s;
return s;
}
@ -1327,17 +1333,17 @@ static void cleanup_agent(GAState *s)
ga_state = NULL;
}
static int run_agent(GAState *s, GAConfig *config, int socket_activation)
static int run_agent(GAState *s)
{
if (!channel_init(ga_state, config->method, config->channel_path,
socket_activation ? FIRST_SOCKET_ACTIVATION_FD : -1)) {
if (!channel_init(s, s->config->method, s->config->channel_path,
s->socket_activation ? FIRST_SOCKET_ACTIVATION_FD : -1)) {
g_critical("failed to initialize guest agent channel");
return EXIT_FAILURE;
}
#ifndef _WIN32
g_main_loop_run(ga_state->main_loop);
#else
if (config->daemonize) {
if (s->config->daemonize) {
SERVICE_TABLE_ENTRY service_table[] = {
{ (char *)QGA_SERVICE_NAME, service_main }, { NULL, NULL } };
StartServiceCtrlDispatcher(service_table);
@ -1425,12 +1431,12 @@ int main(int argc, char **argv)
goto end;
}
s = initialize_agent(config);
s = initialize_agent(config, socket_activation);
if (!s) {
g_critical("error initializing guest agent");
goto end;
}
ret = run_agent(s, config, socket_activation);
ret = run_agent(s);
cleanup_agent(s);
end: