From nobody Sat May 4 05:39:06 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 1491389254563493.98797235954305; Wed, 5 Apr 2017 03:47:34 -0700 (PDT) Received: from localhost ([::1]:39778 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cviTG-0003T3-V1 for importer@patchew.org; Wed, 05 Apr 2017 06:47:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40714) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cviST-00038i-DI for qemu-devel@nongnu.org; Wed, 05 Apr 2017 06:46:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cviSQ-0005YI-MQ for qemu-devel@nongnu.org; Wed, 05 Apr 2017 06:46:37 -0400 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:36328) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cviSQ-0005Xm-Dg for qemu-devel@nongnu.org; Wed, 05 Apr 2017 06:46:34 -0400 Received: by mail-wr0-x242.google.com with SMTP id k6so1483444wre.3 for ; Wed, 05 Apr 2017 03:46:34 -0700 (PDT) Received: from bark.redhat.com ([141.226.163.173]) by smtp.gmail.com with ESMTPSA id f62sm7237091wmh.33.2017.04.05.03.46.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Apr 2017 03:46:32 -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=Kd6oEJwhxXDE22mK0kaGGeJ41ugPOIuLvFZfwTi8/MA=; b=k276E+ggQ9fmWOFf5BdC5MvyqAP8yqQtsMkmhD8uwFj7Qm5YCmXVX8odEMIFNMpioD W602g7GJs6ptINZIWUYNLoBnYBJI2PAtPOq984HEQ3k/9vtWk7sorEjUXSW9H4NDxx6P /vcOu2LoBJGyYnnPzWTosC0MGstkN7OnQzaS6OVAfQvELVytiMk/BNgEQGbkqD6/m2+N fCD2BhetCg7uYChzj++5IdGCyrZF/WMPY9CkjQ5UmBQJSIXULgBDusrF20cst3lfOsGX Rv3scmU0CbK2hD7m5ILOh0UrnYTlf7seOVfsN6lWLxIjJyojbAUPZ2InhQqolQigWOHc M5RA== 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=Kd6oEJwhxXDE22mK0kaGGeJ41ugPOIuLvFZfwTi8/MA=; b=Ak3B/kC403kutLzbuqvYoL1eqxi403//jn1uAIS8YzfB/GQaGp/2jVLpdoc7VkgX3Q C8YeCn1bnVZc2OWDJOitSM4ffcdJLLdwwlIeWAfXfJAlOIdX0Fcemje/tjMuke05QqhV Ufaul6/xYIW2FoDjw+cN93ULYYfmw4+0qRtlyyvDySSJiiXaFzPzUEmvJv1mEBayyYnf nyO2ehm7AjPOuQPDf/H4fIH0bTJw6yJ6tofbIfobXfrYCRzEg8GXH274/IeODr4WDfxD wkNQQAcgddH1cbMTzNiiXzut7buFP8hh9Ip84oBrBafGeKmyCqxJcAlsWcvBMw4pZvLJ I9/A== X-Gm-Message-State: AFeK/H3lbbW7rco4Xbrgx/Qq4qI10Y1AMwIZuo9i7dwvN/A8L/2jQrqE YgxEElO2jFtcaw== X-Received: by 10.28.20.202 with SMTP id 193mr12227630wmu.43.1491389192888; Wed, 05 Apr 2017 03:46:32 -0700 (PDT) From: Sameeh Jubran To: qemu-devel@nongnu.org, Michael Roth Date: Wed, 5 Apr 2017 13:46:27 +0300 Message-Id: <20170405104627.18140-1-sameeh@daynix.com> X-Mailer: git-send-email 2.9.3 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::242 Subject: [Qemu-devel] [PATCH v2] 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 | 22 ++++++++++++++++++++++ qga/vss-win32.h | 1 + qga/vss-win32/vss-common.h | 11 +---------- qga/vss-win32/vss-handles.h | 14 ++++++++++++++ 4 files changed, 38 insertions(+), 10 deletions(-) create mode 100644 qga/vss-win32/vss-handles.h diff --git a/qga/main.c b/qga/main.c index 07c2953..96072fb 100644 --- a/qga/main.c +++ b/qga/main.c @@ -131,9 +131,31 @@ 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", e= rror_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