From nobody Tue Feb 10 03:38:34 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 1538910428487905.9583960752385; Sun, 7 Oct 2018 04:07:08 -0700 (PDT) Received: from localhost ([::1]:41919 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g96tq-0008Gv-Fl for importer@patchew.org; Sun, 07 Oct 2018 07:07:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47071) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g96pY-00053k-A8 for qemu-devel@nongnu.org; Sun, 07 Oct 2018 07:02:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g96pW-0007PL-Bb for qemu-devel@nongnu.org; Sun, 07 Oct 2018 07:02:35 -0400 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:35114) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g96pW-0007Oc-31 for qemu-devel@nongnu.org; Sun, 07 Oct 2018 07:02:34 -0400 Received: by mail-wr1-x42b.google.com with SMTP id w5-v6so17745658wrt.2 for ; Sun, 07 Oct 2018 04:02:33 -0700 (PDT) Received: from bark.daynix ([141.226.163.173]) by smtp.gmail.com with ESMTPSA id v106-v6sm22065671wrc.85.2018.10.07.04.02.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 07 Oct 2018 04:02:31 -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=1AZuVMdkFcKF3/GsgG9BEsBgA5oRIQC868BuIQbRYK0=; b=llEvaiieZXaNtt68ZwOvysCEsTcP4DDArlRVUPd/Ns4W5tv3Mag6qNUpqPM+xibtAL FjWjvP/0s2QRgk7fiPRLficuk8DQm/o9EK0pZtFHZa3IrqihMhKj25b56j6a/T95bYk4 wRk727cwRmCV7IqhdINz5XSS/7KqPYj7xC5vpWPbBOt8Nw/9nRnQEZ+3Hj4Wd6iDwKwA Sk/qi41YTlM4P3TyNWe7P9HUlYmYEfdhklOFVcE1kya+2cQF8VYBsKogW4yqq+n6EIjP n8lbwb92eWDTu6SJ4CwHLTcNR6jCdWxI5xNHL601cvmV2nlGmfh4wW25gHT+kpJtYY+l E8GQ== 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=1AZuVMdkFcKF3/GsgG9BEsBgA5oRIQC868BuIQbRYK0=; b=L0/i8sDAqWZ76VHL7LO3Q6O6Tk+UP2tEZ8acBhPYLttqGqi8eEsKdpChVfAot50xag dfid/oy8tZxRy7TG0Dq8RFld9NVaSrTqq6JEiawj0j/LMUcAeS/KJW3pR6c5KQepCItd 5CGDJo8PIp1SDZtT4vN3vNtQP7rLYbVs0ClS4SN+ksmtCKAtZdFgBr4TgyqlDag/64r1 aYXr3/PcLBSM5Yr3MRQVXdxCDielK2O67xETlbwacCwv9XNU9V5Vkpsg0z+HjiwjmT6l dVfXj7TLAFkcHVFnIzK5WCRGLdTE7pWmrDBpuvipn0Eg69800LEXfyNcaPt3SOw057J1 F5aw== X-Gm-Message-State: ABuFfogxFs8ikUsFnmpIaP7Y8YuNcoRS3nSNWe+WkD4bCylo+F/Zg0jw A7FZyQiiB3NnyDAiblumZWZ1NZga0/4= X-Google-Smtp-Source: ACcGV62Ps5qc7MEW4Vbh3BcILJqb7zsYyJMEEbF4aey4BwvE+VdjItrJvmtwrLEmAaRrfGsHeq6DEw== X-Received: by 2002:adf:a3d0:: with SMTP id m16-v6mr13584090wrb.312.1538910152197; Sun, 07 Oct 2018 04:02:32 -0700 (PDT) From: Bishara AbuHattoum To: qemu-devel@nongnu.org, Michael Roth Date: Sun, 7 Oct 2018 14:02:19 +0300 Message-Id: <20181007110223.129692-4-bishara@daynix.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20181007110223.129692-1-bishara@daynix.com> References: <20181007110223.129692-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::42b Subject: [Qemu-devel] [PATCH v2 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 , Sameeh Jubran 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 Signed-off-by: Bishara AbuHattoum --- qga/main.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/qga/main.c b/qga/main.c index 9f4dc0b2c5..23a0a46b84 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) @@ -729,7 +730,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); @@ -1338,17 +1339,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; } @@ -1434,7 +1426,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.0