Hi
On Thu, Sep 27, 2018 at 11:39 AM Bishara AbuHattoum <[email protected]> wrote:
>
> From: Michael Roth <[email protected]>
>
> Eventually we want a w32 service to be able to restart the qga main
> loop from within service_main(). To allow for this we move service
> handling out of run_agent() such that service_main() calls
> run_agent() instead of the reverse.
>
> Signed-off-by: Michael Roth <[email protected]>
> Message-Id: <[email protected]>
Same remark about message-id
> ---
> qga/main.c | 25 ++++++++++++++-----------
> 1 file changed, 14 insertions(+), 11 deletions(-)
>
> diff --git a/qga/main.c b/qga/main.c
> index 7381053a0f..d9888bff5f 100644
> --- a/qga/main.c
> +++ b/qga/main.c
> @@ -136,6 +136,7 @@ DWORD WINAPI service_ctrl_handler(DWORD ctrl, DWORD type,
> LPVOID data,
> LPVOID ctx);
> VOID WINAPI service_main(DWORD argc, TCHAR *argv[]);
> #endif
> +static int run_agent(GAState *s);
>
> static void
> init_dfl_pathnames(void)
> @@ -763,7 +764,7 @@ VOID WINAPI service_main(DWORD argc, TCHAR *argv[])
> service->status.dwWaitHint = 0;
> SetServiceStatus(service->status_handle, &service->status);
>
> - g_main_loop_run(ga_state->main_loop);
> + run_agent(ga_state);
>
> service->status.dwCurrentState = SERVICE_STOPPED;
> SetServiceStatus(service->status_handle, &service->status);
> @@ -1372,17 +1373,8 @@ static int run_agent(GAState *s)
> 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) {
> - SERVICE_TABLE_ENTRY service_table[] = {
> - { (char *)QGA_SERVICE_NAME, service_main }, { NULL, NULL } };
> - StartServiceCtrlDispatcher(service_table);
> - } else {
> - g_main_loop_run(ga_state->main_loop);
> - }
> -#endif
>
> return EXIT_SUCCESS;
> }
> @@ -1468,7 +1460,18 @@ int main(int argc, char **argv)
> g_critical("error initializing guest agent");
> goto end;
> }
> +
> +#ifdef _WIN32
> + if (config->daemonize) {
> + SERVICE_TABLE_ENTRY service_table[] = {
> + { (char *)QGA_SERVICE_NAME, service_main }, { NULL, NULL } };
> + StartServiceCtrlDispatcher(service_table);
> + } else {
> + ret = run_agent(s);
> + }
> +#endif
> ret = run_agent(s);
run_agent() is called twice.
> +
> cleanup_agent(s);
>
> end:
> --
> 2.17.0
>
>
--
Marc-André Lureau
