mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qga-win: Fix a bug where qemu-ga service is stuck during stop operation

Browse Source 
After triggering a freeze command without any following thaw command,
qemu-ga will not respond to stop operation. This behaviour is wanted on Linux
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 <sameeh@daynix.com>
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
This commit is contained in:
Sameeh Jubran 2017-04-11 10:50:36 +03:00 committed by Michael Roth
parent 54858553de
commit 94d81ae896
4 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
qga/main.c
View File

@ -131,9 +131,32 @@ static void quit_handler(int sig)
* unless all log/pid files are on unfreezable filesystems. there's * unless all log/pid files are on unfreezable filesystems. there's
* also a very likely chance killing the agent before unfreezing * also a very likely chance killing the agent before unfreezing
* the filesystems is a mistake (or will be viewed as one later). * 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)) { if (ga_is_frozen(ga_state)) {
#ifdef _WIN32
int i = 0;
Error *err = NULL;
HANDLE hEventTimeout;
g_debug("Thawing filesystems before exiting");
hEventTimeout = OpenEvent(EVENT_ALL_ACCESS, FALSE, EVENT_NAME_TIMEOUT);
if (hEventTimeout) {
WaitForSingleObject(hEventTimeout, 0);
CloseHandle(hEventTimeout);
}
qga_vss_fsfreeze(&i, false, &err);
if (err) {
g_debug("Error unfreezing filesystems prior to exiting: %s",
error_get_pretty(err));
error_free(err);
}
#else
return; return;
#endif
} }
g_debug("received signal num %d, quitting", sig); g_debug("received signal num %d, quitting", sig);

1
qga/vss-win32.h
View File

@ -13,6 +13,7 @@
#ifndef VSS_WIN32_H #ifndef VSS_WIN32_H
#define VSS_WIN32_H #define VSS_WIN32_H
#include "qga/vss-win32/vss-handles.h"
bool vss_init(bool init_requester); bool vss_init(bool init_requester);
void vss_deinit(bool deinit_requester); void vss_deinit(bool deinit_requester);

11
qga/vss-win32/vss-common.h
View File

@ -51,21 +51,12 @@
* http://www.microsoft.com/en-us/download/details.aspx?id=23490 * http://www.microsoft.com/en-us/download/details.aspx?id=23490
*/ */
#include <inc/win2003/vss.h> #include <inc/win2003/vss.h>
#include "vss-handles.h"
/* Macros to convert char definitions to wchar */ /* Macros to convert char definitions to wchar */
#define _L(a) L##a #define _L(a) L##a
#define L(a) _L(a) #define L(a) _L(a)
/* 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 = { 0x3629d4ed, 0xee09, 0x4e0e, const GUID g_gProviderId = { 0x3629d4ed, 0xee09, 0x4e0e,
{0x9a, 0x5c, 0x6d, 0x8b, 0xa2, 0x87, 0x2a, 0xef} }; {0x9a, 0x5c, 0x6d, 0x8b, 0xa2, 0x87, 0x2a, 0xef} };
const GUID g_gProviderVersion = { 0x11ef8b15, 0xcac6, 0x40d6, const GUID g_gProviderVersion = { 0x11ef8b15, 0xcac6, 0x40d6,

14
qga/vss-win32/vss-handles.h Normal file
View File

@ -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