From nobody Wed May 1 11:53:03 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.zoho.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 1491897117017906.1742347765285; Tue, 11 Apr 2017 00:51:57 -0700 (PDT) Received: from localhost ([::1]:37651 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxqah-00020O-0G for importer@patchew.org; Tue, 11 Apr 2017 03:51:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53788) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cxqZh-0001VD-Gf for qemu-devel@nongnu.org; Tue, 11 Apr 2017 03:50:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cxqZc-0002IO-Ok for qemu-devel@nongnu.org; Tue, 11 Apr 2017 03:50:53 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:33951) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cxqZc-0002H1-EB for qemu-devel@nongnu.org; Tue, 11 Apr 2017 03:50:48 -0400 Received: by mail-wm0-x241.google.com with SMTP id x75so13388108wma.1 for ; Tue, 11 Apr 2017 00:50:46 -0700 (PDT) Received: from bark.daynix ([141.226.163.173]) by smtp.gmail.com with ESMTPSA id p185sm1354309wme.20.2017.04.11.00.50.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Apr 2017 00:50:45 -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; bh=I4RHiLR6y2K8yRRLiGgFCF/zTJ+1dZv8460b0kxsrns=; b=tKPiYHqpk2DORunGqZ2A2fp9Q1wjCcbesrjQs9yTAos5Bd77aoejJ4dRZgKWU2NPnm 5qITh5XX+2Cnfw59jKnX7qCVMci4q3xMpGpCL/9c1xNVDwWFNGqIXn5sSPXQZHkjlQiU gChU+8wa+HIXs5/V1AerRt3V4p2BnNYWZQAzyfUqzLC1eAb38a73ylX5ElAW9qb/+eEF YdmrEFj3kgwaaptq4Rg7RlOJiIAQKTvhJo7oUWnHtPjGHyk5jnyEuqEraYj+JxY71gg7 egwxjwFObUXnqwlrPW2KaGI4lScqxaWsX1v5ajxTSh8/dop4sjtLXJxjkNR9COPTT/d3 v3dA== 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; bh=I4RHiLR6y2K8yRRLiGgFCF/zTJ+1dZv8460b0kxsrns=; b=Rj0yzoCRJ3VzYI8B7FpCmKyXs2UGvrdFGRByVaQYrq+7ISzEhmD5S0ad6CCgbZzXcs fhtY8Zt1nbZ16yzdNF89CgSPjgO3OAi5pJB7xOjfMgLulj3yd9TMiMqO7i5rRju7XIaE v34AltHvzJu2yNb/zJzr45S0xXIHTboGxf9TuykBVR6sOHOn2IFT0FxF/sz/iHwxo6KC vlaQdd144HPJaxo6f9bcY7xciIW+W0k8J+KOQZi20HQ2/vdiVDlvIgCe2KMXZPsL33Xp 7Wl3rAVY4Ma80RST/eogJI0QuVstD4sntASdxgTPYgfeP6adL/cQ/rq7Ifbe0IkLPAz/ jcPQ== X-Gm-Message-State: AN3rC/4YRTq2kogZAXNwyEl3Btz9yaa3U/yOMX3iZyEfQoiRVsZ+iQUO pcLHNxMywZ/vMg== X-Received: by 10.28.181.69 with SMTP id e66mr13307967wmf.33.1491897045725; Tue, 11 Apr 2017 00:50:45 -0700 (PDT) From: Sameeh Jubran To: qemu-devel@nongnu.org, Michael Roth Date: Tue, 11 Apr 2017 10:50:36 +0300 Message-Id: <20170411075036.20206-1-sameeh@daynix.com> X-Mailer: git-send-email 2.9.3 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PATCH v3] qga-win: Fix a bug where qemu-ga service is stuck during stop operation 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" After triggering a freeze command without any following thaw command, qemu-ga will not respond to stop operation. This behaviour is wanted on Lin= ux as there is no time limit for a freeze command and we want to prevent quitting in the middle of freeze, on the other hand on Windows the time limit for freeze is 10 seconds, so we should wait for the timeout, thaw the file system and quit. Signed-off-by: Sameeh Jubran --- qga/main.c | 23 +++++++++++++++++++++++ qga/vss-win32.h | 1 + qga/vss-win32/vss-common.h | 11 +---------- qga/vss-win32/vss-handles.h | 14 ++++++++++++++ 4 files changed, 39 insertions(+), 10 deletions(-) create mode 100644 qga/vss-win32/vss-handles.h diff --git a/qga/main.c b/qga/main.c index 07c2953..8269bf4 100644 --- a/qga/main.c +++ b/qga/main.c @@ -131,9 +131,32 @@ static void quit_handler(int sig) * unless all log/pid files are on unfreezable filesystems. there's * also a very likely chance killing the agent before unfreezing * the filesystems is a mistake (or will be viewed as one later). + * On Windows the freeze interval is limited to 10 seconds, so + * we should quit, but first we should wait for the timeout, thaw + * the filesystem and quit. */ if (ga_is_frozen(ga_state)) { +#ifdef _WIN32 + int i =3D 0; + Error *err =3D NULL; + HANDLE hEventTimeout; + + g_debug("Thawing filesystems before exiting"); + + hEventTimeout =3D OpenEvent(EVENT_ALL_ACCESS, FALSE, EVENT_NAME_TI= MEOUT); + if (hEventTimeout) { + WaitForSingleObject(hEventTimeout, 0); + CloseHandle(hEventTimeout); + } + qga_vss_fsfreeze(&i, &err, false); + if (err) { + g_debug("Error unfreezing filesystems prior to exiting: %s", + error_get_pretty(err)); + error_free(err); + } +#else return; +#endif } g_debug("received signal num %d, quitting", sig); =20 diff --git a/qga/vss-win32.h b/qga/vss-win32.h index 4d1d150..cd9f26e 100644 --- a/qga/vss-win32.h +++ b/qga/vss-win32.h @@ -13,6 +13,7 @@ #ifndef VSS_WIN32_H #define VSS_WIN32_H =20 +#include "qga/vss-win32/vss-handles.h" =20 bool vss_init(bool init_requester); void vss_deinit(bool deinit_requester); diff --git a/qga/vss-win32/vss-common.h b/qga/vss-win32/vss-common.h index c81a856..61c170b 100644 --- a/qga/vss-win32/vss-common.h +++ b/qga/vss-win32/vss-common.h @@ -51,21 +51,12 @@ * http://www.microsoft.com/en-us/download/details.aspx?id=3D23490 */ #include +#include "vss-handles.h" =20 /* Macros to convert char definitions to wchar */ #define _L(a) L##a #define L(a) _L(a) =20 -/* Constants for QGA VSS Provider */ - -#define QGA_PROVIDER_NAME "QEMU Guest Agent VSS Provider" -#define QGA_PROVIDER_LNAME L(QGA_PROVIDER_NAME) -#define QGA_PROVIDER_VERSION L(QEMU_VERSION) - -#define EVENT_NAME_FROZEN "Global\\QGAVSSEvent-frozen" -#define EVENT_NAME_THAW "Global\\QGAVSSEvent-thaw" -#define EVENT_NAME_TIMEOUT "Global\\QGAVSSEvent-timeout" - const GUID g_gProviderId =3D { 0x3629d4ed, 0xee09, 0x4e0e, {0x9a, 0x5c, 0x6d, 0x8b, 0xa2, 0x87, 0x2a, 0xef} }; const GUID g_gProviderVersion =3D { 0x11ef8b15, 0xcac6, 0x40d6, diff --git a/qga/vss-win32/vss-handles.h b/qga/vss-win32/vss-handles.h new file mode 100644 index 0000000..ff399dd --- /dev/null +++ b/qga/vss-win32/vss-handles.h @@ -0,0 +1,14 @@ +#ifndef VSS_HANDLES +#define VSS_HANDLES + +/* Constants for QGA VSS Provider */ + +#define QGA_PROVIDER_NAME "QEMU Guest Agent VSS Provider" +#define QGA_PROVIDER_LNAME L(QGA_PROVIDER_NAME) +#define QGA_PROVIDER_VERSION L(QEMU_VERSION) + +#define EVENT_NAME_FROZEN "Global\\QGAVSSEvent-frozen" +#define EVENT_NAME_THAW "Global\\QGAVSSEvent-thaw" +#define EVENT_NAME_TIMEOUT "Global\\QGAVSSEvent-timeout" + +#endif --=20 2.9.3