From nobody Tue May 7 23:56:47 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 1490104808197828.8893265203699; Tue, 21 Mar 2017 07:00:08 -0700 (PDT) Received: from localhost ([::1]:40419 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqKKU-00034S-VX for importer@patchew.org; Tue, 21 Mar 2017 10:00:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52326) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cqKJm-0002mJ-T1 for qemu-devel@nongnu.org; Tue, 21 Mar 2017 09:59:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cqKJi-0005mQ-AK for qemu-devel@nongnu.org; Tue, 21 Mar 2017 09:59:23 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:32970) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cqKJi-0005mI-2J for qemu-devel@nongnu.org; Tue, 21 Mar 2017 09:59:18 -0400 Received: by mail-wr0-x243.google.com with SMTP id g10so22582429wrg.0 for ; Tue, 21 Mar 2017 06:59:17 -0700 (PDT) Received: from bark.daynix ([141.226.163.173]) by smtp.gmail.com with ESMTPSA id m201sm17803105wmd.19.2017.03.21.06.59.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Mar 2017 06:59:16 -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=uPVzo8m+CpErJLQ8leFtc6T4UciG5cl18madXri7pO0=; b=jtOvpICGYwQt7+QwDZWFp9YHOwH32M9SiQ1IpPG1pT7PpoLPFROUnUvSmh1pRi3cZ5 RBGLm0EQaARvdjIqpGWi2H4HVFlAoMHkYaebVlLdgKD8R0yJtOJjF8Alp2m9C38uN999 t3I6d7kse1wnQM3ExGIALoQmB/AwulYWj+mdeYk0NYer/fgjPtDswq8W8IfAl+7LvdPt NI9Cif8A4G/zD5+jmMANIpwvxmX+i1N2/gd0U9TuYDqKSoKb8M/rYoCNIVz5hn7VZOww pdBuoDSv4lQYNIb+wLbJDvKpNY7C3PkgY2iSycsO3mSOUoTrRxftf4s4wpCSvU3xAPi6 GgkA== 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=uPVzo8m+CpErJLQ8leFtc6T4UciG5cl18madXri7pO0=; b=f1RUO6a/E0KhKnVCksYZ7SwJXgHLn0xp+H2DmykIrfzI6DypLfIqF5HGx4k/dQi/jO h4lPFfgJE8ItECyt/ffHS+JG+RIKJb+rEU+HKqTS0S7ZgTIILjf2ZqI2lT3kOxM6nI9O 8Tjt3eJpkz0uIebybFa8xwcXV5xx008DOVeXyA1HkTSAuIxnCij1eBqR3lTbTLShBuQm yOoXdIT2PoH6J7oP6zMBLanpOuVCdUlR/Mq6MvNRV44SPHL6j5q8Ag6BIHV066Uwkv9A uvkHFhJ1N/ObKUN9/HBsDcf2zuhVvdYFnWx9uZC98Soi0lpjsI2Hw2DbeOtq3gZQmDTy ROqg== X-Gm-Message-State: AFeK/H3FQqZRumbGSQhFAy/K8FdMOQ3CuFZSk7kLBV297fQeO4ymEvdYwQk1xGh42bccsw== X-Received: by 10.223.151.138 with SMTP id s10mr33510641wrb.35.1490104756620; Tue, 21 Mar 2017 06:59:16 -0700 (PDT) From: Sameeh Jubran To: qemu-devel@nongnu.org, Michael Roth Date: Tue, 21 Mar 2017 15:59:11 +0200 Message-Id: <20170321135911.22731-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::243 Subject: [Qemu-devel] [PATCH qemu-ga] 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: 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 | 20 ++++++++++++++++++++ qga/vss-win32.h | 1 + qga/vss-win32/vss-common.h | 5 +++++ 3 files changed, 26 insertions(+) diff --git a/qga/main.c b/qga/main.c index 92658bc..de37c85 100644 --- a/qga/main.c +++ b/qga/main.c @@ -130,9 +130,29 @@ 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; + + 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: %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..5f4ea70 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-common.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..5756d00 100644 --- a/qga/vss-win32/vss-common.h +++ b/qga/vss-win32/vss-common.h @@ -12,6 +12,7 @@ =20 #ifndef VSS_COMMON_H #define VSS_COMMON_H +#ifndef VSS_WIN32_H =20 #define __MIDL_user_allocate_free_DEFINED__ #include @@ -57,6 +58,7 @@ #define L(a) _L(a) =20 /* Constants for QGA VSS Provider */ +#endif =20 #define QGA_PROVIDER_NAME "QEMU Guest Agent VSS Provider" #define QGA_PROVIDER_LNAME L(QGA_PROVIDER_NAME) @@ -66,6 +68,8 @@ #define EVENT_NAME_THAW "Global\\QGAVSSEvent-thaw" #define EVENT_NAME_TIMEOUT "Global\\QGAVSSEvent-timeout" =20 +#ifndef VSS_WIN32_H + const GUID g_gProviderId =3D { 0x3629d4ed, 0xee09, 0x4e0e, {0x9a, 0x5c, 0x6d, 0x8b, 0xa2, 0x87, 0x2a, 0xef} }; const GUID g_gProviderVersion =3D { 0x11ef8b15, 0xcac6, 0x40d6, @@ -126,3 +130,4 @@ public: }; =20 #endif +#endif --=20 2.9.3