From nobody Tue Feb 10 02:00:31 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15380339832291005.5928076751566; Thu, 27 Sep 2018 00:39:43 -0700 (PDT) Received: from localhost ([::1]:34174 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g5Qti-0000Gn-3V for importer@patchew.org; Thu, 27 Sep 2018 03:39:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59292) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g5Qqg-00067V-4e for qemu-devel@nongnu.org; Thu, 27 Sep 2018 03:36:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g5Qqe-0003oI-US for qemu-devel@nongnu.org; Thu, 27 Sep 2018 03:36:33 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:40663) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g5Qqe-0003gj-IN for qemu-devel@nongnu.org; Thu, 27 Sep 2018 03:36:32 -0400 Received: by mail-wr1-x42a.google.com with SMTP id y8-v6so1415052wrh.7 for ; Thu, 27 Sep 2018 00:36:32 -0700 (PDT) Received: from bark.daynix ([141.226.163.173]) by smtp.gmail.com with ESMTPSA id y206-v6sm1708129wmg.14.2018.09.27.00.36.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 27 Sep 2018 00:36:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=cMki+yWgqGNj6df9psObSnQQdBlE588Lc4TNkfrn9h8=; b=uuH4tJFtYHjDt3TdeHrFUAOcV/dUrAuqvFUHMZHjElFZvv8jKtF3nW9FXO+VWj2F+j rOBKmHZNqVY92sa1w3e3WkvC134N0lF7DB3jNHVe6IvBFBUFLaBACxFo/QwqyKg+fZ2T Ci6t16F+hrZIMJ5f3B5YKXjz5oWlbu4UwSwuZNhzAuQo7Ijte3+BLadfC2F5L9+FXiOz cX6VParPXosCtF5iA+aseQiURwAHCLpYxp72hcqTr+2R+/SH+3pVFeT/YY80TwiFBPN1 nBpyuA0tcaKKnr+gtSfYTLgZxuYnwtckGPcyzb20KwKXKx555E8EsFnPab+sdF4SODXq Rsew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=cMki+yWgqGNj6df9psObSnQQdBlE588Lc4TNkfrn9h8=; b=bQO3edPzx9C1KzzbbwFwlY56DVexIC0tR+vlMsuD3VVbYgkLVNwQd4DqKeDp3SYgv5 C01+IKhNico/7fuS098+NbEcsr+ijSV+n7/TN6EVvD1443+WM8v0aLTa6QV020nhFceH 2lk2wa7HsoeoNudaAMF28/6rANdzuhV2jril51s9+cZG9LYj6U4gaMkjlvZFlH3J0xu5 W+EW3x1G/NPQIqAI8xLQGsB/H0bdrepuc8j+yC6AoSfKq+P3Z8snbyYeC0bB6hmJpgUT bpaHtKF302lNqN/3we59JOYJRn9fjmvZrB5ueSFEN9lbTdpl2qM+WRVvITRH11d9fEuK lMpw== X-Gm-Message-State: ABuFfog8iHKmOTDTwSqqCZ7ezXZjXFVVn18nnmrFz2vTheGs3TT5W0WQ 3ZYVmCX0yHzEeQ/95ajT8vDqrJ20QV8= X-Google-Smtp-Source: ACcGV61LTRnpGHHUWkPbojvlEzGxTF6QG2TfpjBylal9ZZ5gvsSDDoPL8hBsaUNSbGBMtiycRF1EOA== X-Received: by 2002:adf:a925:: with SMTP id u34-v6mr8205475wrc.175.1538033791237; Thu, 27 Sep 2018 00:36:31 -0700 (PDT) From: Bishara AbuHattoum To: qemu-devel@nongnu.org, Michael Roth Date: Thu, 27 Sep 2018 10:36:20 +0300 Message-Id: <20180927073624.17163-4-bishara@daynix.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180927073624.17163-1-bishara@daynix.com> References: <20180927073624.17163-1-bishara@daynix.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42a Subject: [Qemu-devel] [PATCH 3/7] qga: move w32 service handling out of run_agent() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Yan Vugenfirer Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Michael Roth 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 Message-Id: <20171026233054.21133-4-mdroth@linux.vnet.ibm.com> --- 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 typ= e, LPVOID data, LPVOID ctx); VOID WINAPI service_main(DWORD argc, TCHAR *argv[]); #endif +static int run_agent(GAState *s); =20 static void init_dfl_pathnames(void) @@ -763,7 +764,7 @@ VOID WINAPI service_main(DWORD argc, TCHAR *argv[]) service->status.dwWaitHint =3D 0; SetServiceStatus(service->status_handle, &service->status); =20 - g_main_loop_run(ga_state->main_loop); + run_agent(ga_state); =20 service->status.dwCurrentState =3D 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[] =3D { - { (char *)QGA_SERVICE_NAME, service_main }, { NULL, NULL } }; - StartServiceCtrlDispatcher(service_table); - } else { - g_main_loop_run(ga_state->main_loop); - } -#endif =20 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[] =3D { + { (char *)QGA_SERVICE_NAME, service_main }, { NULL, NULL } }; + StartServiceCtrlDispatcher(service_table); + } else { + ret =3D run_agent(s); + } +#endif ret =3D run_agent(s); + cleanup_agent(s); =20 end: --=20 2.17.0