[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 19/24] qga: hang GAConfig/socket_activation off of GA
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PULL 19/24] qga: hang GAConfig/socket_activation off of GAState global |
Date: |
Tue, 30 Oct 2018 09:43:53 -0500 |
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 <address@hidden>
Signed-off-by: Sameeh Jubran <address@hidden>
*dont move GAConfig struct, just the typedef
*fix build bisect for w32
Signed-off-by: Michael Roth <address@hidden>
---
qga/main.c | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/qga/main.c b/qga/main.c
index ab3eaa5163..eb31f99b38 100644
--- a/qga/main.c
+++ b/qga/main.c
@@ -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:
--
2.17.1
- [Qemu-devel] [PULL 09/24] build: rename CONFIG_QGA_NTDDDISK to CONFIG_QGA_NTDDSCSI, (continued)
- [Qemu-devel] [PULL 09/24] build: rename CONFIG_QGA_NTDDDISK to CONFIG_QGA_NTDDSCSI, Michael Roth, 2018/10/30
- [Qemu-devel] [PULL 11/24] qga-win: refactor disk properties (bus), Michael Roth, 2018/10/30
- [Qemu-devel] [PULL 15/24] qga-win: return disk device in guest-get-fsinfo, Michael Roth, 2018/10/30
- [Qemu-devel] [PULL 10/24] qga-win: add debugging information, Michael Roth, 2018/10/30
- [Qemu-devel] [PULL 14/24] qga-win: handle multi-disk volumes, Michael Roth, 2018/10/30
- [Qemu-devel] [PULL 12/24] qga-win: report disk serial number, Michael Roth, 2018/10/30
- [Qemu-devel] [PULL 13/24] qga-win: refactor disk info, Michael Roth, 2018/10/30
- [Qemu-devel] [PULL 18/24] qga: group agent init/cleanup init separate routines, Michael Roth, 2018/10/30
- [Qemu-devel] [PULL 16/24] qga-win: demystify namespace stripping, Michael Roth, 2018/10/30
- [Qemu-devel] [PULL 17/24] qga: fix an off-by-one issue, Michael Roth, 2018/10/30
- [Qemu-devel] [PULL 19/24] qga: hang GAConfig/socket_activation off of GAState global,
Michael Roth <=
- [Qemu-devel] [PULL 20/24] qga: move w32 service handling out of run_agent(), Michael Roth, 2018/10/30
- [Qemu-devel] [PULL 01/24] qga: Support Unicode paths in guest-file-open on win32, Michael Roth, 2018/10/30
- [Qemu-devel] [PULL 22/24] qga-win: install service with --retry-path set by default, Michael Roth, 2018/10/30
- [Qemu-devel] [PULL 21/24] qga: add --retry-path option for re-initializing channel on failure, Michael Roth, 2018/10/30
- [Qemu-devel] [PULL 23/24] qga-win: report specific error when failing to open channel, Michael Roth, 2018/10/30
- [Qemu-devel] [PULL 02/24] qga-win: add support for qmp_guest_fsfreeze_freeze_list, Michael Roth, 2018/10/30
- [Qemu-devel] [PULL 24/24] qga-win: changing --retry-path option behavior, Michael Roth, 2018/10/30
- [Qemu-devel] [PULL 03/24] qga: ignore non present cpus when handling qmp_guest_get_vcpus(), Michael Roth, 2018/10/30
- [Qemu-devel] [PULL 04/24] configure: add test for libudev, Michael Roth, 2018/10/30
- [Qemu-devel] [PULL 05/24] qga: linux: report disk serial number, Michael Roth, 2018/10/30