From nobody Thu Nov 6 12:13:06 2025 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 154091138197827.41084257833063; Tue, 30 Oct 2018 07:56:21 -0700 (PDT) Received: from localhost ([::1]:53703 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHVRM-0001om-98 for importer@patchew.org; Tue, 30 Oct 2018 10:56:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46401) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gHVGO-0007fM-CK for qemu-devel@nongnu.org; Tue, 30 Oct 2018 10:45:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gHVGN-0000ZD-IA for qemu-devel@nongnu.org; Tue, 30 Oct 2018 10:45:00 -0400 Received: from mail-qt1-x834.google.com ([2607:f8b0:4864:20::834]:37190) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gHVGN-0000Yg-CQ for qemu-devel@nongnu.org; Tue, 30 Oct 2018 10:44:59 -0400 Received: by mail-qt1-x834.google.com with SMTP id d14-v6so13743993qto.4 for ; Tue, 30 Oct 2018 07:44:59 -0700 (PDT) Received: from localhost (76-251-165-188.lightspeed.austtx.sbcglobal.net. [76.251.165.188]) by smtp.gmail.com with ESMTPSA id j4-v6sm14525710qte.84.2018.10.30.07.44.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Oct 2018 07:44:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=ab6VptyiBF+UH0FW+m/qIjGDhVLzmPY8RK/Fm0aX5X0=; b=qmV0sHg03KnSMAAkWydmxqGIue7cps/v3mPW9VKlthuB780d1Tl9zQIWIYit9q0SsR B3S8SGE9+8lyTzcIKXsbD1Nlov5+Sjr4YdEY5cGe0zqAtkmKC6K60RNvO1urhFzAB+Gl aRkh0sr/3wTtpCkWX6RgbnJ+qTH0D/uczyuRHOxuZoUYCJOhRjJ+OQUl3M803ZBmH766 07RKGbO0gouY5133lqRc7WaDO/qw7rIriT0ax3gI9tldcLSPuKHTJbN3bCRu+JPegZVd Sr1HET11KuwvRD2gevqZMqph5937vHH9JPaek/75rhEypN8y3KrPIsPmxHM5pm3YqwQQ vALg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=ab6VptyiBF+UH0FW+m/qIjGDhVLzmPY8RK/Fm0aX5X0=; b=DweMW9NzBbO6vgJaumq4eJFIp67iQQmxcI9R/8Oz6dBSysaKz/R39NQ+OfE7MfIVHx Bb3V5y+a62sWrt+4zXfrPUddcr4aVEJ5m/8GpzZpYm21f0DgBKrq3MLNj5RLcsNEABDe bFcpbyujmd10ugolVxgz2yTIlzPLHIwBdUVH2YuA+oMjpmy7vSCbsdqPaESEfH76d2fV meQ/4DtwqUniTC6kSr51f2SR0FwFFty6DAk6ZuFDxafYUw3CjL9tWSP2+btAev4slx5d eYKcMxnpITZE0pcEjhgyzMVbZktvnvqDjnCxDrtPIXCR3vPmBOYzkyZxda+sIEsI7h0m qN/g== X-Gm-Message-State: AGRZ1gKiSQFx0aOPqaogRr76f8xFKkehC53wFl6voD9E+qOqwsAbYB1B US0i94y8/pqWE+iF/H93AJ2HGlE7 X-Google-Smtp-Source: AJdET5f9nuLSLC8V0azwRVcf5kXOoiL0+z1tt9wkaJFLjuIdSZxdG7Wkzok1AbCTGcmK2IgUhbrnfg== X-Received: by 2002:a0c:b458:: with SMTP id e24mr17060340qvf.37.1540910698048; Tue, 30 Oct 2018 07:44:58 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Tue, 30 Oct 2018 09:43:54 -0500 Message-Id: <20181030144358.23144-21-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181030144358.23144-1-mdroth@linux.vnet.ibm.com> References: <20181030144358.23144-1-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::834 Subject: [Qemu-devel] [PULL 20/24] 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: Bishara AbuHattoum , peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 Signed-off-by: Bishara AbuHattoum Signed-off-by: Michael Roth --- qga/main.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/qga/main.c b/qga/main.c index eb31f99b38..761007deb4 100644 --- a/qga/main.c +++ b/qga/main.c @@ -119,6 +119,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) @@ -712,7 +713,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); @@ -1340,17 +1341,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 (s->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; } @@ -1436,7 +1428,19 @@ 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); + } +#else ret =3D run_agent(s); +#endif + cleanup_agent(s); =20 end: --=20 2.17.1