diff options
| author | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-11 14:46:08 -0500 |
|---|---|---|
| committer | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-11 14:46:08 -0500 |
| commit | f69f0bcac951f3c3089246695874b84ea8967936 (patch) | |
| tree | 32a6a6b8d64bc60d94994a02e2eb2dcd99c31756 /QMP | |
| parent | 97fdb9410bb5398fd33f51a37e637d697ace9f73 (diff) | |
| parent | e2682db06a6c218f149ff990959c31f3b3d82003 (diff) | |
| download | qemu-f69f0bcac951f3c3089246695874b84ea8967936.tar.gz qemu-f69f0bcac951f3c3089246695874b84ea8967936.tar.bz2 qemu-f69f0bcac951f3c3089246695874b84ea8967936.zip | |
Merge remote-tracking branch 'mdroth/qga-pull-2013-9-9' into staging
# By Tomoki Sekiyama (10) and Paul Burton (1)
# Via Michael Roth
* mdroth/qga-pull-2013-9-9:
QMP/qemu-ga-client: Make timeout longer for guest-fsfreeze-freeze command
qemu-ga: Install Windows VSS provider on `qemu-ga -s install'
qemu-ga: Call Windows VSS requester in fsfreeze command handler
qemu-ga: Add Windows VSS provider and requester as DLL
error: Add error_set_win32 and error_setg_win32
qemu-ga: Add configure options to specify path to Windows/VSS SDK
Add a script to extract VSS SDK headers on POSIX system
checkpatch.pl: Check .cpp files
Add c++ keywords to QAPI helper script
configure: Support configuring C++ compiler
mips_malta: support up to 2GiB RAM
Message-id: 1378755701-2051-1-git-send-email-mdroth@linux.vnet.ibm.com
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
Diffstat (limited to 'QMP')
| -rwxr-xr-x | QMP/qemu-ga-client | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/QMP/qemu-ga-client b/QMP/qemu-ga-client index 46676c3750..b5f7e7c5ff 100755 --- a/QMP/qemu-ga-client +++ b/QMP/qemu-ga-client @@ -267,7 +267,9 @@ def main(address, cmd, args): print('Hint: qemu is not running?') sys.exit(1) - if cmd != 'ping': + if cmd == 'fsfreeze' and args[0] == 'freeze': + client.sync(60) + elif cmd != 'ping': client.sync() globals()['_cmd_' + cmd](client, args) |