From nobody Sat May 4 22:22:45 2024 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 1499241367023479.438065932762; Wed, 5 Jul 2017 00:56:07 -0700 (PDT) Received: from localhost ([::1]:44686 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSfAK-0005io-Cb for importer@patchew.org; Wed, 05 Jul 2017 03:56:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56997) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSf8j-0004XC-Vi for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:54:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dSf8f-0006uT-PL for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:54:26 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:33325) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dSf8f-0006u2-Jm for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:54:21 -0400 Received: by mail-wm0-x244.google.com with SMTP id j85so30641254wmj.0 for ; Wed, 05 Jul 2017 00:54:19 -0700 (PDT) Received: from bark.daynix ([141.226.163.173]) by smtp.gmail.com with ESMTPSA id 22sm29144444wru.29.2017.07.05.00.54.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Jul 2017 00:54:18 -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:list-id; bh=ug+/zaNYt3TgppC6UviASyMq3Tfkyn2KBNa2Y/sYmrU=; b=0aTSilKnV3ihG5UbSadDr8xHEl3ff5QWdBQflwOOB+7XY7nfJ/0oG9p2+qi8acK9/s 0QJL1nN9jMwO5obUD4K7OsOf/qtEHLFmGrPFCs9UK7Jo27xtyiokn0mcODAHCCp19JIL I4HugQETP39QCAhzWXjYT6ODD/OpBFr5hZ99WMXA0INgBTsJzqKQ+ZuPY48EZmNk2VcP GoNknkNLVuxkbOYdBMc/VKZ8Q5KouR/jyxMQ3s7GPcJZkq/mRJRPGISIYPMQxsvgPH3i kkBhitTrBC7I2jUS919fAFa0H/wjWgQpTW5aYwejQZv9aeahTKi7NOJR4rSdm/cObc7H YpKQ== 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:list-id; bh=ug+/zaNYt3TgppC6UviASyMq3Tfkyn2KBNa2Y/sYmrU=; b=rjyyTix9t+zvr7LqDUj/FfrtNzrd0lj3siik8aH9+bLBJEtwLSK5HjEz9GZ3IhVnAq C8KCZWrh2XbHI8N66MnBfJfAKNkym5xS6LxEdCbT/cpNpg0kQapBer24j62tNh3L5uN5 kqZnSHKDXwFYBvY1OxoJo3LYxRKs5+xxvqhcnARDj1cGaYgMeOsDlYSCpgsFGKCl2nsa 5i8mxHONIMEQ/giuK8F8ITX74BpKQtuEEAoHIchEvEAM2fv92ZzbVzFFORJqxNhSXBpq 66cbD4tUqGA5ytJ0FshOyPHMFuinNSmEuh32EyQrQtAMsJaMdPMT//zXn0NWm/YD/x/v Ce7g== X-Gm-Message-State: AIVw110xEPE5Ol//Ssy5y8whe3ng/Fhw4fFE6OH2RIOWq+JEdEBq1zRq UCbvOnnkmKSbjEd7QEo= X-Received: by 10.28.217.3 with SMTP id q3mr12191369wmg.115.1499241258791; Wed, 05 Jul 2017 00:54:18 -0700 (PDT) From: Sameeh Jubran To: qemu-devel@nongnu.org, Michael Roth Date: Wed, 5 Jul 2017 10:54:07 +0300 Message-Id: <20170705075411.6556-2-sameeh@daynix.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170705075411.6556-1-sameeh@daynix.com> References: <20170705075411.6556-1-sameeh@daynix.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PATCH 1/5] Makefile: clean: Clean exe files 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: Sameeh Jubran Clean exe files such as qemu-ga.exe Signed-off-by: Sameeh Jubran --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 16a0430..22d29d6 100644 --- a/Makefile +++ b/Makefile @@ -487,6 +487,7 @@ clean: rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h ge= n-op-arm.h rm -f qemu-options.def rm -f *.msi + rm -f *${EXESUF} find . \( -name '*.so' -o -name '*.dll' -o -name '*.mo' -o -name '*.[oda]= ' \) -type f -exec rm {} + rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) qemu-ga TAGS cscope.* *.p= od *~ */*~ rm -f fsdev/*.pod --=20 2.9.4 From nobody Sat May 4 22:22:45 2024 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 1499241370156188.91434724304224; Wed, 5 Jul 2017 00:56:10 -0700 (PDT) Received: from localhost ([::1]:44687 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSfAM-0005ks-P4 for importer@patchew.org; Wed, 05 Jul 2017 03:56:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57001) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSf8k-0004XI-1D for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:54:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dSf8h-0006uv-RU for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:54:26 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:35925) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dSf8h-0006uf-KK for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:54:23 -0400 Received: by mail-wm0-x243.google.com with SMTP id y5so30601550wmh.3 for ; Wed, 05 Jul 2017 00:54:23 -0700 (PDT) Received: from bark.daynix ([141.226.163.173]) by smtp.gmail.com with ESMTPSA id 22sm29144444wru.29.2017.07.05.00.54.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Jul 2017 00:54:19 -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:list-id; bh=k+x3gsGGxj6c6BPG0aaCmvXColjf2Qgod7PSCXs1YqY=; b=GWZeUENsVJ4aR5NUOLLSG8dZi1CGXHqvsiFzxxFZzAk+jvVGM9T2vN56YjRxN1buCj fIQoQN96Uoonfrwo6DFGTiMMsSeq+TbDIOIJVaZ+9WLrvV5dcNYc8yPBmwy3q0Yiekvz 1SroAD7a7q0LaBmwGW8IKJvMlAw25X/If+M7g6IaaKJcPL2aUWiTuVSAuUb1D9B9+RNR kwQE4gEpo5h42kWUnK5H+JhEubKxWPSVBhi30kRU59VWB4g0rrSNZ+fUe6D+338vA+bT x9oAS3WDymZR6r1V+PW89qXFU30Y9h7fcceNPzfmUZokMKGoDZtIBK5KsBT84h+Jem7/ /ZZg== 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:list-id; bh=k+x3gsGGxj6c6BPG0aaCmvXColjf2Qgod7PSCXs1YqY=; b=UVmq67eFPuPAfzDsbkp5CyWATvqArtehQEUEIGuuFYhSXtI+Wna5hOLd6k/Ofhbfbz ZzD1t5LvFSJ0Enk42l2qS5/97t5/v+/K0R4pn8/6aG+4KFQDNuCPbjb9rJqyvaFTd0ek FJxmMatg1ltshiqhMiD8LczseJjmBd7AL8WJhq9VQ3EwGb7FschVOPg7Y/pOETYubbEH Oz8pWLdcUBXx8b2aERx5G2Gu4pBax9iCPtUi+HA4cqkLETbnPCTgQbVVdWzpym2l0dF9 Zuzo040dSbfu/zJjn2ttwjhGQn737I1+x7DmQ6qk7CaXRcnfgWYqo7Rr15JVqOiQ9SLe Dqow== X-Gm-Message-State: AKS2vOyRGmwk2h6J1hvkObCaHs2UUn+EV7miSOC5OmLuZBfHV9fDtpc9 B3+rLvdoO01KYkKC958= X-Received: by 10.28.136.129 with SMTP id k123mr29174534wmd.14.1499241262300; Wed, 05 Jul 2017 00:54:22 -0700 (PDT) From: Sameeh Jubran To: qemu-devel@nongnu.org, Michael Roth Date: Wed, 5 Jul 2017 10:54:08 +0300 Message-Id: <20170705075411.6556-3-sameeh@daynix.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170705075411.6556-1-sameeh@daynix.com> References: <20170705075411.6556-1-sameeh@daynix.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PATCH 2/5] qga-win: service-win32: Add start_service and stop_service functions 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: Sameeh Jubran This commits adds two functions which handle service's start and stop process in Windows. Signed-off-by: Sameeh Jubran --- qga/service-win32.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++= +++ qga/service-win32.h | 2 ++ 2 files changed, 54 insertions(+) diff --git a/qga/service-win32.c b/qga/service-win32.c index fd434e3..dc41d63 100644 --- a/qga/service-win32.c +++ b/qga/service-win32.c @@ -95,6 +95,26 @@ static const char *win_escape_arg(const char *to_escape,= GString *buffer) return buffer->str; } =20 + +static int get_service(const char *service_name, SC_HANDLE* service) +{ + SC_HANDLE manager =3D NULL; + manager =3D OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); + if (manager =3D=3D NULL) { + printf_win_error("No handle to service control manager"); + return EXIT_FAILURE; + } + + *service =3D OpenService(manager, service_name, SERVICE_ALL_ACCESS); + if (service =3D=3D NULL) { + printf_win_error("Failed to open service"); + return EXIT_FAILURE; + } + + CloseServiceHandle(manager); + return EXIT_SUCCESS; +} + int ga_install_service(const char *path, const char *logfile, const char *state_dir) { @@ -188,3 +208,35 @@ int ga_uninstall_service(void) =20 return EXIT_SUCCESS; } + +int start_service(const char *service_name) +{ + int ret =3D EXIT_FAILURE; + SC_HANDLE service =3D NULL; + ret =3D get_service(service_name, &service); + if (ret !=3D EXIT_SUCCESS) { + return ret; + } + ret =3D StartService(service, 0 , NULL) ? EXIT_SUCCESS : GetLastError(= ); + + CloseServiceHandle(service); + return ret; +} + +int stop_service(const char *service_name) +{ + int ret =3D EXIT_FAILURE; + SC_HANDLE service =3D NULL; + + SERVICE_STATUS service_status; + ret =3D get_service(service_name, &service); + + if (ret !=3D EXIT_SUCCESS) { + return ret; + } + ret =3D ControlService(service, SERVICE_CONTROL_STOP, &service_status)= ? + EXIT_SUCCESS : GetLastError(); + + CloseServiceHandle(service); + return ret; +} diff --git a/qga/service-win32.h b/qga/service-win32.h index 89e99df..65248ea 100644 --- a/qga/service-win32.h +++ b/qga/service-win32.h @@ -28,5 +28,7 @@ typedef struct GAService { int ga_install_service(const char *path, const char *logfile, const char *state_dir); int ga_uninstall_service(void); +int start_service(const char *service_name); +int stop_service(const char *service_name); =20 #endif --=20 2.9.4 From nobody Sat May 4 22:22:45 2024 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 1499241567851943.3061434415276; Wed, 5 Jul 2017 00:59:27 -0700 (PDT) Received: from localhost ([::1]:44705 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSfDa-0000Cf-C0 for importer@patchew.org; Wed, 05 Jul 2017 03:59:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57039) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSf8l-0004YF-Kb for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:54:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dSf8j-0006vU-HU for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:54:27 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:34778) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dSf8j-0006vA-6L for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:54:25 -0400 Received: by mail-wm0-x242.google.com with SMTP id p204so30729536wmg.1 for ; Wed, 05 Jul 2017 00:54:24 -0700 (PDT) Received: from bark.daynix ([141.226.163.173]) by smtp.gmail.com with ESMTPSA id 22sm29144444wru.29.2017.07.05.00.54.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Jul 2017 00:54:23 -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:list-id; bh=4tIjxXwhmMvddEVbavtwmN2XXMrRTrphnTP0pvMO9Do=; b=mNizglFzB+GiXGHa/9eXw19iPNOQRHjYzFNEqJK4rtokPjSUsU5EzLbNrPFHuWjRMP +DHgOv/chyoQQZqtQV0wJYkljkvn4DjzjNl8PLDtM5IH1wVcKCGEbmppfZYOZke6HsV0 foD7VjxmfoD7RG3h4qaogrsOmFlg7yMZ+mo/EqtVjwHoCZj/cWw7AKuArHjTrUMb549L nusB54xJ/z6x0ryCaewk/i8uXDetiJZXXF3VojpJx/TSIbrSKd7hLftsqBum+HzBVs5s D2ibkUXihy+aXoGW7cOn+1/Y9g10lmJn3d2rTMdJ+brEXBjn4h4hKfaO/A7rZCq+V5Jm SjBA== 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:list-id; bh=4tIjxXwhmMvddEVbavtwmN2XXMrRTrphnTP0pvMO9Do=; b=mbzse55XQwHGVJLQ6G0NRGf5ABAHkbOgpBD//e4q6sOVZG+R7D36uyYd1J0VRKmrPj v0YN7U7w6zRgR8MgSF9tH8WDunG0XcuS8VldpjOSDn4IeUDsFW4dCh3ubLFGK9jSseZ/ 6/NVOptYvO0Z6gThvnWpCRX9I2kesAxyslyNX1VmKAPBUEmbJEGTiU8jo2cZ73aHaXf9 pazS+cdDuHxqF4i/aw84FeqwsNqgkrsTv3REIKsabT9ZGBbcg44LUHZkcT7itYfDIxBA t6k3FciheDX4qVVcclJ0bMUv8YzRzBpGjK1+g9RePQsyuZ7eQ00lAg9XsrtVHuuOoNPS XPWg== X-Gm-Message-State: AKS2vOyFQaFst3MYP6P9/U14/hhEgQ0V69icteh4dXG2MD/sMPMZMF10 G3XLqx712iuRpp69tkU= X-Received: by 10.28.51.212 with SMTP id z203mr32670987wmz.103.1499241263466; Wed, 05 Jul 2017 00:54:23 -0700 (PDT) From: Sameeh Jubran To: qemu-devel@nongnu.org, Michael Roth Date: Wed, 5 Jul 2017 10:54:09 +0300 Message-Id: <20170705075411.6556-4-sameeh@daynix.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170705075411.6556-1-sameeh@daynix.com> References: <20170705075411.6556-1-sameeh@daynix.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PATCH 3/5] qga-win: Add serial listener service 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: Sameeh Jubran Currently on Windows whenever the qemu-ga's service doesn't find the virtio= -serial it terminates. This commit addresses this issue by adding a new listener se= rvice which registers for notifications of the virtio-port-serial device handle t= he qemu-ga's service accordingly. Note that adding a new service to the qga code is much neater and simpler t= han changing the behaviour of the qemu-ga's service as a good portion of the co= de is shared between Windows and Linux. A list of possible scenarios of which could lead to this behavour: * qemu-ga's service is started while the virtio-serial driver hasn't been i= nstalled yet * hotplug/ unplug of the virtio-serial device * upgrading the virtio-serial driver Signed-off-by: Sameeh Jubran --- Makefile | 11 ++- Makefile.objs | 1 + qga/Makefile.objs | 2 + qga/channel.h | 9 ++ qga/main.c | 23 +++-- qga/serial-listener-service-win32.c | 181 ++++++++++++++++++++++++++++++++= ++++ qga/serial-listener-service-win32.h | 29 ++++++ qga/service-win32.c | 79 +++++++++++++--- qga/service-win32.h | 3 + 9 files changed, 315 insertions(+), 23 deletions(-) create mode 100644 qga/serial-listener-service-win32.c create mode 100644 qga/serial-listener-service-win32.h diff --git a/Makefile b/Makefile index 22d29d6..3583c8d 100644 --- a/Makefile +++ b/Makefile @@ -266,6 +266,7 @@ dummy :=3D $(call unnest-vars,, \ chardev-obj-y \ util-obj-y \ qga-obj-y \ + qga-serial-listener-obj-y \ ivshmem-client-obj-y \ ivshmem-server-obj-y \ libvhost-user-obj-y \ @@ -390,6 +391,9 @@ qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PAT= H)/scripts/hxtool qemu-ga$(EXESUF): LIBS =3D $(LIBS_QGA) qemu-ga$(EXESUF): QEMU_CFLAGS +=3D -I qga/qapi-generated =20 +qga-serial-listener$(EXESUF): LIBS =3D $(LIBS_QGA) +qga-serial-listener$(EXESUF): QEMU_CFLAGS +=3D -I qga/qapi-generated + gen-out-type =3D $(subst .,-,$(suffix $@)) =20 qapi-py =3D $(SRC_PATH)/scripts/qapi.py $(SRC_PATH)/scripts/ordereddict.py @@ -448,6 +452,11 @@ $(qga-obj-y) qemu-ga.o: $(QGALIB_GEN) qemu-ga$(EXESUF): $(qga-obj-y) $(COMMON_LDADDS) $(call LINK, $^) =20 +$(qga-serial-listener-obj-y) qga-serial-listener.o: $(QGALIB_GEN) + +qga-serial-listener$(EXESUF): $(qga-serial-listener-obj-y) $(COMMON_LDADDS) + $(call LINK, $^) + ifdef QEMU_GA_MSI_ENABLED QEMU_GA_MSI=3Dqemu-ga-$(ARCH).msi =20 @@ -467,7 +476,7 @@ endif =20 ifneq ($(EXESUF),) .PHONY: qemu-ga -qemu-ga: qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI) +qemu-ga: qga-serial-listener$(EXESUF) qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER)= $(QEMU_GA_MSI) endif =20 ivshmem-client$(EXESUF): $(ivshmem-client-obj-y) $(COMMON_LDADDS) diff --git a/Makefile.objs b/Makefile.objs index b2e6322..b3fc042 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -103,6 +103,7 @@ target-obj-y +=3D trace/ # FIXME: a few definitions from qapi-types.o/qapi-visit.o are needed # by libqemuutil.a. These should be moved to a separate .json schema. qga-obj-y =3D qga/ +qga-serial-listener-obj-y =3D qga/ qga-vss-dll-obj-y =3D qga/ =20 ###################################################################### diff --git a/qga/Makefile.objs b/qga/Makefile.objs index 1c5986c..f9d0170 100644 --- a/qga/Makefile.objs +++ b/qga/Makefile.objs @@ -5,4 +5,6 @@ qga-obj-$(CONFIG_WIN32) +=3D vss-win32.o qga-obj-y +=3D qapi-generated/qga-qapi-types.o qapi-generated/qga-qapi-vis= it.o qga-obj-y +=3D qapi-generated/qga-qmp-marshal.o =20 +qga-serial-listener-obj-$(CONFIG_WIN32) =3D service-win32.o serial-listene= r-service-win32.o + qga-vss-dll-obj-$(CONFIG_QGA_VSS) +=3D vss-win32/ diff --git a/qga/channel.h b/qga/channel.h index 1778416..df53ec9 100644 --- a/qga/channel.h +++ b/qga/channel.h @@ -12,6 +12,15 @@ #ifndef QGA_CHANNEL_H #define QGA_CHANNEL_H =20 +#ifndef _WIN32 +#define QGA_VIRTIO_PATH_DEFAULT "/dev/virtio-ports/org.qemu.guest_agent.0" +#define QGA_STATE_RELATIVE_DIR "run" +#define QGA_SERIAL_PATH_DEFAULT "/dev/ttyS0" +#else +#define QGA_VIRTIO_PATH_DEFAULT "\\\\.\\Global\\org.qemu.guest_agent.0" +#define QGA_STATE_RELATIVE_DIR "qemu-ga" +#define QGA_SERIAL_PATH_DEFAULT "COM1" +#endif =20 typedef struct GAChannel GAChannel; =20 diff --git a/qga/main.c b/qga/main.c index cc58d2b..44b0822 100644 --- a/qga/main.c +++ b/qga/main.c @@ -41,15 +41,6 @@ #endif #endif =20 -#ifndef _WIN32 -#define QGA_VIRTIO_PATH_DEFAULT "/dev/virtio-ports/org.qemu.guest_agent.0" -#define QGA_STATE_RELATIVE_DIR "run" -#define QGA_SERIAL_PATH_DEFAULT "/dev/ttyS0" -#else -#define QGA_VIRTIO_PATH_DEFAULT "\\\\.\\Global\\org.qemu.guest_agent.0" -#define QGA_STATE_RELATIVE_DIR "qemu-ga" -#define QGA_SERIAL_PATH_DEFAULT "COM1" -#endif #ifdef CONFIG_FSFREEZE #define QGA_FSFREEZE_HOOK_DEFAULT CONFIG_QEMU_CONFDIR "/fsfreeze-hook" #endif @@ -1163,6 +1154,10 @@ static void config_parse(GAConfig *config, int argc,= char **argv) if (ga_install_vss_provider()) { exit(EXIT_FAILURE); } + if (ga_install_serial_listener_service(config->channel_pat= h, + config->log_filepath, config->state_dir)) { + exit(EXIT_FAILURE); + } if (ga_install_service(config->channel_path, config->log_filepath, config->state= _dir)) { exit(EXIT_FAILURE); @@ -1170,6 +1165,7 @@ static void config_parse(GAConfig *config, int argc, = char **argv) exit(EXIT_SUCCESS); } else if (strcmp(config->service, "uninstall") =3D=3D 0) { ga_uninstall_vss_provider(); + ga_uninstall_serial_listener_service(); exit(ga_uninstall_service()); } else if (strcmp(config->service, "vss-install") =3D=3D 0) { if (ga_install_vss_provider()) { @@ -1179,6 +1175,15 @@ static void config_parse(GAConfig *config, int argc,= char **argv) } else if (strcmp(config->service, "vss-uninstall") =3D=3D 0) { ga_uninstall_vss_provider(); exit(EXIT_SUCCESS); + } else if (strcmp(config->service, "sl-install") =3D=3D 0) { + if (ga_install_serial_listener_service(config->channel_pat= h, + config->log_filepath, config->state_dir)) { + exit(EXIT_FAILURE); + } + exit(EXIT_SUCCESS); + } else if (strcmp(config->service, "sl-uninstall") =3D=3D 0) { + ga_uninstall_serial_listener_service(); + exit(EXIT_SUCCESS); } else { printf("Unknown service command.\n"); exit(EXIT_FAILURE); diff --git a/qga/serial-listener-service-win32.c b/qga/serial-listener-serv= ice-win32.c new file mode 100644 index 0000000..fa22055 --- /dev/null +++ b/qga/serial-listener-service-win32.c @@ -0,0 +1,181 @@ +/* + * QEMU Guest Agent helpers for win32 service management + * + * Authors: + * Sameeh Jubran + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ +#include "qemu/osdep.h" +#include +#include +#include "qga/channel.h" +#include "qga/serial-listener-service-win32.h" + +static const GUID GUID_VIOSERIAL_PORT =3D { 0x6fde7521, 0x1b65, 0x48ae, + { 0xb6, 0x28, 0x80, 0xbe, 0x62, 0x1, 0x60, 0x26 } }; + +GASerialListenerService listener_service; +GMainLoop *main_loop; +bool barrier; +bool qga_vios_exists; + +DWORD WINAPI handle_serial_device_events(DWORD type, LPVOID data); +DWORD WINAPI service_ctrl_handler(DWORD ctrl, DWORD type, LPVOID data, + LPVOID ctx); +VOID WINAPI service_main(DWORD argc, TCHAR * argv[]); +static void quit_handler(int sig); +static bool virtio_serial_exists(DWORD *err); + +static bool virtio_serial_exists(DWORD *err) +{ + bool ret =3D false; + HANDLE handle =3D CreateFile(QGA_VIRTIO_PATH_DEFAULT, GENERIC_READ | + GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_FLAG_NO_BUFFERING | + FILE_FLAG_OVERLAPPED, NULL); + + if (handle =3D=3D INVALID_HANDLE_VALUE) { + *err =3D GetLastError(); + ret =3D false; + } else { + ret =3D true; + } + CloseHandle(handle); + return ret; +} + +static void quit_handler(int sig) +{ + if (g_main_loop_is_running(main_loop)) { + g_main_loop_quit(main_loop); + } +} + +DWORD WINAPI handle_serial_device_events(DWORD type, LPVOID data) +{ + DWORD ret =3D NO_ERROR; + DWORD err_code; + PDEV_BROADCAST_HDR broadcast_header =3D (PDEV_BROADCAST_HDR) data; + if (barrier && + broadcast_header->dbch_devicetype =3D=3D DBT_DEVTYP_DEVICEINTERFAC= E) { + switch (type) { + /* Device inserted */ + case DBT_DEVICEARRIVAL: + /* Start QEMU-ga's service */ + if (!qga_vios_exists && virtio_serial_exists(&err_code)) { + start_service(QGA_SERVICE_NAME); + qga_vios_exists =3D true; + } + break; + /* Device removed */ + case DBT_DEVICEQUERYREMOVE: + case DBT_DEVICEREMOVEPENDING: + case DBT_DEVICEREMOVECOMPLETE: + /* Stop QEMU-ga's service */ + /* In a stop operation, we need to make sure the virtio-serial= that + * qemu-ga uses is the one that is being ejected. We'll get the= error + * ERROR_FILE_NOT_FOUND when attempting to call CreateFile with= the + * virtio-serial path. + */ + if (qga_vios_exists && !virtio_serial_exists(&err_code) && + err_code =3D=3D ERROR_FILE_NOT_FOUND) { + stop_service(QGA_SERVICE_NAME); + qga_vios_exists =3D false; + } + + break; + default: + ret =3D ERROR_CALL_NOT_IMPLEMENTED; + } + } + return ret; +} + +DWORD WINAPI service_ctrl_handler(DWORD ctrl, DWORD type, LPVOID data, + LPVOID ctx) +{ + DWORD ret =3D NO_ERROR; + + switch (ctrl) { + case SERVICE_CONTROL_STOP: + case SERVICE_CONTROL_SHUTDOWN: + quit_handler(SIGTERM); + listener_service.qga_service.status.dwCurrentState =3D + SERVICE_STOP_PENDING; + SetServiceStatus(listener_service.qga_service.status_handle, + &listener_service.qga_service.status); + case SERVICE_CONTROL_DEVICEEVENT: + handle_serial_device_events(type, data); + break; + + default: + ret =3D ERROR_CALL_NOT_IMPLEMENTED; + } + return ret; +} + +VOID WINAPI service_main(DWORD argc, TCHAR * argv[]) +{ + DWORD err_code =3D NO_ERROR; + qga_vios_exists =3D barrier =3D false; + listener_service.qga_service.status_handle =3D + RegisterServiceCtrlHandlerEx(QGA_SERIAL_LISTENER_SERVICE_NAME, + service_ctrl_handler, NULL); + + if (listener_service.qga_service.status_handle =3D=3D 0) { + g_critical("Failed to register extended requests function!\n"); + return; + } + + listener_service.qga_service.status.dwServiceType =3D SERVICE_WIN32; + listener_service.qga_service.status.dwCurrentState =3D SERVICE_RUNNING; + listener_service.qga_service.status.dwControlsAccepted =3D SERVICE_ACC= EPT_STOP + | SERVICE_ACCEPT_SHUTDOWN; + listener_service.qga_service.status.dwWin32ExitCode =3D NO_ERROR; + listener_service.qga_service.status.dwServiceSpecificExitCode =3D NO_E= RROR; + listener_service.qga_service.status.dwCheckPoint =3D 0; + listener_service.qga_service.status.dwWaitHint =3D 0; + SetServiceStatus(listener_service.qga_service.status_handle, + &listener_service.qga_service.status); + + DEV_BROADCAST_DEVICEINTERFACE notification_filter; + ZeroMemory(¬ification_filter, sizeof(notification_filter)); + notification_filter.dbcc_devicetype =3D DBT_DEVTYP_DEVICEINTERFACE; + notification_filter.dbcc_size =3D sizeof(DEV_BROADCAST_DEVICEINTER= FACE); + notification_filter.dbcc_classguid =3D GUID_VIOSERIAL_PORT; + + listener_service.device_notification_handle =3D + RegisterDeviceNotification(listener_service.qga_service.status_han= dle, + ¬ification_filter, DEVICE_NOTIFY_SERVICE_HANDLE); + if (!listener_service.device_notification_handle) { + g_critical("Failed to register device notification handle!\n"); + return; + } + + qga_vios_exists =3D virtio_serial_exists(&err_code); + /* In case qemu-ga is already running then Create file will return Acc= ess + * denied when trying to open the virtio serial + */ + if (!qga_vios_exists && err_code =3D=3D ERROR_ACCESS_DENIED) { + qga_vios_exists =3D true; + } + barrier =3D true; + + main_loop =3D g_main_loop_new(NULL, false); + g_main_loop_run(main_loop); + UnregisterDeviceNotification(listener_service.device_notification_hand= le); + listener_service.qga_service.status.dwCurrentState =3D SERVICE_STOPPED; + SetServiceStatus(listener_service.qga_service.status_handle, + &listener_service.qga_service.status); +} + +int main(int argc, char **argv) +{ + SERVICE_TABLE_ENTRY service_table[] =3D { + { (char *)QGA_SERIAL_LISTENER_SERVICE_NAME, service_main }, + { NULL, NULL } }; + StartServiceCtrlDispatcher(service_table); + + return EXIT_SUCCESS; +} diff --git a/qga/serial-listener-service-win32.h b/qga/serial-listener-serv= ice-win32.h new file mode 100644 index 0000000..57b47c0 --- /dev/null +++ b/qga/serial-listener-service-win32.h @@ -0,0 +1,29 @@ +/* + * QEMU Guest Agent helpers for win32 service management + * + * Authors: + * Sameeh Jubran + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ + +#ifndef QGA__SERIAL_LISTENER_SERVICE_WIN32_H +#define QGA__SERIAL_LISTENER_SERVICE_WIN32_H + +#include + +#define QGA_SERIAL_LISTENER_SERVICE_DISPLAY_NAME "QEMU Guest Agent Serial \ +Listener" +#define QGA_SERIAL_LISTENER_SERVICE_NAME "QEMU Guest Agent Serial \ +Listener" +#define QGA_SERIAL_LISTENER_SERVICE_DESCRIPTION "Enables running qemu-ga \ +service on serial device events" +#define QGA_SERIAL_LISTENER_BINARY_NAME "qga-serial-listener.exe" + +typedef struct GASerialListenerService { + GAService qga_service; + HDEVNOTIFY device_notification_handle; +} GASerialListenerService; + +#endif diff --git a/qga/service-win32.c b/qga/service-win32.c index dc41d63..861f9fc 100644 --- a/qga/service-win32.c +++ b/qga/service-win32.c @@ -12,7 +12,9 @@ */ #include "qemu/osdep.h" #include +#include "shlwapi.h" #include "qga/service-win32.h" +#include "qga/serial-listener-service-win32.h" =20 static int printf_win_error(const char *text) { @@ -108,6 +110,7 @@ static int get_service(const char *service_name, SC_HAN= DLE* service) *service =3D OpenService(manager, service_name, SERVICE_ALL_ACCESS); if (service =3D=3D NULL) { printf_win_error("Failed to open service"); + CloseServiceHandle(manager); return EXIT_FAILURE; } =20 @@ -115,27 +118,23 @@ static int get_service(const char *service_name, SC_H= ANDLE* service) return EXIT_SUCCESS; } =20 -int ga_install_service(const char *path, const char *logfile, - const char *state_dir) +static int install_service(const char *path, const char *logfile, + const char *state_dir, TCHAR *binary_path, LPCTSTR service_name, + LPCTSTR service_display_name, SERVICE_DESCRIPTION service_desc, + bool start_service) { int ret =3D EXIT_FAILURE; SC_HANDLE manager; SC_HANDLE service; - TCHAR module_fname[MAX_PATH]; GString *esc; GString *cmdline; - SERVICE_DESCRIPTION desc =3D { (char *)QGA_SERVICE_DESCRIPTION }; =20 - if (GetModuleFileName(NULL, module_fname, MAX_PATH) =3D=3D 0) { - printf_win_error("No full path to service's executable"); - return EXIT_FAILURE; - } =20 esc =3D g_string_new(""); cmdline =3D g_string_new(""); =20 g_string_append_printf(cmdline, "%s -d", - win_escape_arg(module_fname, esc)); + win_escape_arg(binary_path, esc)); =20 if (path) { g_string_append_printf(cmdline, " -p %s", win_escape_arg(path, esc= )); @@ -157,7 +156,7 @@ int ga_install_service(const char *path, const char *lo= gfile, goto out_strings; } =20 - service =3D CreateService(manager, QGA_SERVICE_NAME, QGA_SERVICE_DISPL= AY_NAME, + service =3D CreateService(manager, service_name, service_display_name, SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, cmdline->str, NULL, NULL, NULL, NULL, NULL); if (service =3D=3D NULL) { @@ -165,8 +164,12 @@ int ga_install_service(const char *path, const char *l= ogfile, goto out_manager; } =20 - ChangeServiceConfig2(service, SERVICE_CONFIG_DESCRIPTION, &desc); + ChangeServiceConfig2(service, SERVICE_CONFIG_DESCRIPTION, &service_des= c); fprintf(stderr, "Service was installed successfully.\n"); + + if (start_service && StartService(service, 0, NULL)) { + fprintf(stderr, "Service was started successfully.\n"); + } ret =3D EXIT_SUCCESS; CloseServiceHandle(service); =20 @@ -179,7 +182,21 @@ out_strings: return ret; } =20 -int ga_uninstall_service(void) +int ga_install_service(const char *path, const char *logfile, + const char *state_dir) +{ + TCHAR module_fname[MAX_PATH]; + + if (GetModuleFileName(NULL, module_fname, MAX_PATH) =3D=3D 0) { + printf_win_error("No full path to service's executable"); + return EXIT_FAILURE; + } + SERVICE_DESCRIPTION service_desc =3D { (char *)QGA_SERVICE_DESCRIPTION= }; + return install_service(path, logfile, state_dir, module_fname, + QGA_SERVICE_NAME, QGA_SERVICE_DISPLAY_NAME, service_desc, true); +} + +static int uninstall_service(LPCTSTR service_name) { SC_HANDLE manager; SC_HANDLE service; @@ -190,7 +207,7 @@ int ga_uninstall_service(void) return EXIT_FAILURE; } =20 - service =3D OpenService(manager, QGA_SERVICE_NAME, DELETE); + service =3D OpenService(manager, service_name, DELETE); if (service =3D=3D NULL) { printf_win_error("No handle to service"); CloseServiceHandle(manager); @@ -209,6 +226,42 @@ int ga_uninstall_service(void) return EXIT_SUCCESS; } =20 +int ga_uninstall_service(void) +{ + return uninstall_service(QGA_SERVICE_NAME); +} + +int ga_install_serial_listener_service(const char *path, const char *logfi= le, + const char *state_dir) +{ + TCHAR module_fname[MAX_PATH]; + TCHAR binary_path[MAX_PATH]; + + if (GetModuleFileName(NULL, module_fname, MAX_PATH) =3D=3D 0) { + printf_win_error("No full path to service's executable"); + return EXIT_FAILURE; + } + fprintf(stderr, "ga_install_serial_listener_service: module name: %s\n= ", + module_fname); + PathRemoveFileSpec(module_fname); + if (SearchPath(module_fname, QGA_SERIAL_LISTENER_BINARY_NAME, NULL, + MAX_PATH, binary_path, NULL) =3D=3D 0) { + printf_win_error("No full path to service's executable"); + return EXIT_FAILURE; + } + + SERVICE_DESCRIPTION service_desc =3D { + (char *)QGA_SERIAL_LISTENER_SERVICE_DESCRIPTION }; + return install_service(path, logfile, state_dir, binary_path, + QGA_SERIAL_LISTENER_SERVICE_NAME, + QGA_SERIAL_LISTENER_SERVICE_DISPLAY_NAME, service_desc, true); +} + +int ga_uninstall_serial_listener_service(void) +{ + return uninstall_service(QGA_SERIAL_LISTENER_SERVICE_NAME); +} + int start_service(const char *service_name) { int ret =3D EXIT_FAILURE; diff --git a/qga/service-win32.h b/qga/service-win32.h index 65248ea..2728303 100644 --- a/qga/service-win32.h +++ b/qga/service-win32.h @@ -28,6 +28,9 @@ typedef struct GAService { int ga_install_service(const char *path, const char *logfile, const char *state_dir); int ga_uninstall_service(void); +int ga_install_serial_listener_service(const char *path, const char *logfi= le, + const char *state_dir); +int ga_uninstall_serial_listener_service(void); int start_service(const char *service_name); int stop_service(const char *service_name); =20 --=20 2.9.4 From nobody Sat May 4 22:22:45 2024 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 1499241383427600.7375908018982; Wed, 5 Jul 2017 00:56:23 -0700 (PDT) Received: from localhost ([::1]:44689 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSfAb-0005yo-32 for importer@patchew.org; Wed, 05 Jul 2017 03:56:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57018) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSf8k-0004Xi-R3 for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:54:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dSf8k-0006ve-0s for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:54:26 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:34780) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dSf8j-0006vP-Qa for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:54:25 -0400 Received: by mail-wm0-x244.google.com with SMTP id p204so30729591wmg.1 for ; Wed, 05 Jul 2017 00:54:25 -0700 (PDT) Received: from bark.daynix ([141.226.163.173]) by smtp.gmail.com with ESMTPSA id 22sm29144444wru.29.2017.07.05.00.54.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Jul 2017 00:54:24 -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:list-id; bh=INwfoP5L1CiudejetewG5ZY9PX+ncXBiIQSjMFqwG18=; b=M95lm/LYT1dtmu1ji3FL3XpK+mu7PbKZ62iyh8zMPuQMDvOvqaXQLqxjxzPHMLBhik /cCKqSGBtcRkk+Cn9NYFqwtBFek2564PlZnCErCVCiZo6EXDu5usjI9MDLkjyZhJdUgj tovl+qywslyTKiRQPLhXGZU0xDxsxdJWfJX1EXMnISzJ8DOCZ1cNbvbtalo8jSxcsT1b Dv/t5meUzkCNIjy5OUCntzPH4/Xa4SbycNAI9r1Y7AjTu8P+CG34IdCvZKdLdgr31lw8 imvkTHM5Vtqj+PVvRoYzBA4RwvOy3fAcfKujZ9AseeK7srDujUPkZ62LREU+2nQ6PbaN m0tQ== 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:list-id; bh=INwfoP5L1CiudejetewG5ZY9PX+ncXBiIQSjMFqwG18=; b=PjLcHO5TrH72Q3dERgfMcUM51KsxbTtvSKd3GhCN20EZcrePF6BtaOxTSZmy7df8mu F6HjYkHzy06fqsOzoKOZhoknbxI/nbUkVQoLPcw0//UFFSfwI7Yzo7rYZ9EAqqnyvWuc PkBwGjf6trDSqutlhXRGCjCah9QnhfLUfK3vdq+9nneT9rDoHjdDcw/lGzVncOyjqFA9 BdOnxxLVJAmRYFXF6PRBvlgbLQkI/M/20q9YSeEAv6YGMl3d3TT5a8jtPZ5LanQ5TYCA wtdrZVxfTpEtcpkWZw2c1kimNtUqAKwehGx70/VZeJXFhFQyinsEOnUT+EkrKTa/FRpu GqqQ== X-Gm-Message-State: AKS2vOzWvxj/2s7EMnV0uXgdRy3LG7yVYVpXjBVQDQCgrJwHCTSio+rF NlRLvHGJ/QK+dStkSLo= X-Received: by 10.28.209.70 with SMTP id i67mr32114099wmg.3.1499241264465; Wed, 05 Jul 2017 00:54:24 -0700 (PDT) From: Sameeh Jubran To: qemu-devel@nongnu.org, Michael Roth Date: Wed, 5 Jul 2017 10:54:10 +0300 Message-Id: <20170705075411.6556-5-sameeh@daynix.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170705075411.6556-1-sameeh@daynix.com> References: <20170705075411.6556-1-sameeh@daynix.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PATCH 4/5] qga-win: Add qga-serial-listener to msi installer 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: Sameeh Jubran Signed-off-by: Sameeh Jubran --- qga/installer/qemu-ga.wxs | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/qga/installer/qemu-ga.wxs b/qga/installer/qemu-ga.wxs index fa2260c..40b7a7b 100644 --- a/qga/installer/qemu-ga.wxs +++ b/qga/installer/qemu-ga.wxs @@ -83,6 +83,9 @@ + + + @@ -139,6 +142,24 @@ =20 + + + + + + + @@ -176,6 +198,8 @@ =20 + I= nstalled + NOT REMOVE Installed NOT REMOVE<= /Custom> --=20 2.9.4 From nobody Sat May 4 22:22:45 2024 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 1499241490157297.7000252325711; Wed, 5 Jul 2017 00:58:10 -0700 (PDT) Received: from localhost ([::1]:44700 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSfCK-0007XY-V5 for importer@patchew.org; Wed, 05 Jul 2017 03:58:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57041) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dSf8l-0004YO-Qy for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:54:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dSf8l-0006wK-07 for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:54:27 -0400 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:34431) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dSf8k-0006vp-QR for qemu-devel@nongnu.org; Wed, 05 Jul 2017 03:54:26 -0400 Received: by mail-wr0-x244.google.com with SMTP id k67so49070999wrc.1 for ; Wed, 05 Jul 2017 00:54:26 -0700 (PDT) Received: from bark.daynix ([141.226.163.173]) by smtp.gmail.com with ESMTPSA id 22sm29144444wru.29.2017.07.05.00.54.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Jul 2017 00:54:25 -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:list-id; bh=hHxC/ezqq+kdKWe+oyYFiPJkn/cjWGUrAmaw3PdyVMc=; b=e5zxpC/of5EQDLtzzCy0IotQu0fpPwVfDUytgrkrH80wPexPSb3AbxTcAsD/krAjpU VSpx6avD0fnHcWJIahNCSUNztwUFm3xEPELfSM3T5mV1qmztjylvc324BF5E1UUcSI79 POwNYMyPaxR58doeb8k+pmayRUujMRM8dOvyx7cq/UhWOvUYg0l0InEv0ajt2tWwShy1 QtT7GTcUeznDjWnxrRiQ8Mma3WyH6dtrHo+Osb441hClWzb7M7/ul+t4R0K/FKPopKgX nWbSGlo3tgx4yrMtKCyYZ/pGO6zwMH23C/ZZLOHuehdofE5fVFz7B8hczGoLit3RE1z6 YXlA== 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:list-id; bh=hHxC/ezqq+kdKWe+oyYFiPJkn/cjWGUrAmaw3PdyVMc=; b=dw78RzQwfXpUP1s1/9iy5rxev2NgI+BpMbwXVhYP/mIDuCpyTUV906VU/18zz9eagJ SEjexr6igcN1c+GNQkcdLEz6QtTjqYcAMOai52M45Krtte/bn+rJO0r+FC2GenbJ95S9 j2pFrIwXha5kxNIfBBhlmgN3Q9hiSlasQT/ErDp3MvIM5zo08tMUX09eNX/xHbeW+Bd6 BSbydHI5E4WRTtGFaPSkx06NOPOcp/y/Y38tbNRDCcLwIT04KEA2IyJqKK2yObOrZaU8 5Iy3F7RgLj4s0G27lhdvwuL5oed4I7wrkR/3frxQ1yMx+NMvSh60LzUaS6a+cJhYfvQF ZbOA== X-Gm-Message-State: AKS2vOzvznM2fhiUPoNzfdRJTlRhRJoZCUweEwMBd70bW7Wt9sKo2muc TeHD/I4fKZYu64kzgj0= X-Received: by 10.223.139.24 with SMTP id n24mr40695700wra.116.1499241265501; Wed, 05 Jul 2017 00:54:25 -0700 (PDT) From: Sameeh Jubran To: qemu-devel@nongnu.org, Michael Roth Date: Wed, 5 Jul 2017 10:54:11 +0300 Message-Id: <20170705075411.6556-6-sameeh@daynix.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170705075411.6556-1-sameeh@daynix.com> References: <20170705075411.6556-1-sameeh@daynix.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::244 Subject: [Qemu-devel] [PATCH 5/5] qga-win: service-win32: Use get_service function 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: Sameeh Jubran Signed-off-by: Sameeh Jubran --- qga/service-win32.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/qga/service-win32.c b/qga/service-win32.c index 861f9fc..c17e0eb 100644 --- a/qga/service-win32.c +++ b/qga/service-win32.c @@ -198,20 +198,12 @@ int ga_install_service(const char *path, const char *= logfile, =20 static int uninstall_service(LPCTSTR service_name) { - SC_HANDLE manager; - SC_HANDLE service; - - manager =3D OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); - if (manager =3D=3D NULL) { - printf_win_error("No handle to service control manager"); - return EXIT_FAILURE; - } + int ret =3D EXIT_FAILURE; + SC_HANDLE service =3D NULL; + ret =3D get_service(service_name, &service); =20 - service =3D OpenService(manager, service_name, DELETE); - if (service =3D=3D NULL) { - printf_win_error("No handle to service"); - CloseServiceHandle(manager); - return EXIT_FAILURE; + if (ret !=3D EXIT_SUCCESS) { + return ret; } =20 if (DeleteService(service) =3D=3D FALSE) { @@ -221,7 +213,6 @@ static int uninstall_service(LPCTSTR service_name) } =20 CloseServiceHandle(service); - CloseServiceHandle(manager); =20 return EXIT_SUCCESS; } --=20 2.9.4