my $callback = sub {
my ($vmid, $resp) = @_;
$result = $resp->{'return'};
+ $result = { error => $resp->{'error'} } if !defined($result) && $resp->{'error'};
};
die "no command specified" if !($cmd && $cmd->{execute});
$timeout = 60*60; # 1 hour
} elsif ($cmd->{execute} =~ m/^(eject|change)/) {
$timeout = 60; # note: cdrom mount command is slow
+ } elsif ($cmd->{execute} eq 'guest-fsfreeze-freeze') {
+ # freeze syncs all guest FS, if we kill it it stays in an unfreezable
+ # locked state with high probability, so use an generous timeout
+ $timeout = 60*60; # 1 hour
+ } elsif ($cmd->{execute} eq 'guest-fsfreeze-thaw') {
+ # thaw has no possible long blocking actions, either it returns
+ # instantly or never (dead locked)
+ $timeout = 10;
} elsif ($cmd->{execute} eq 'savevm-start' ||
$cmd->{execute} eq 'savevm-end' ||
$cmd->{execute} eq 'query-backup' ||
$cmd->{execute} eq 'query-block-jobs' ||
+ $cmd->{execute} eq 'block-job-cancel' ||
+ $cmd->{execute} eq 'block-job-complete' ||
$cmd->{execute} eq 'backup-cancel' ||
$cmd->{execute} eq 'query-savevm' ||
$cmd->{execute} eq 'delete-drive-snapshot' ||
$cmd->{execute} eq 'guest-shutdown' ||
+ $cmd->{execute} eq 'blockdev-snapshot-internal-sync' ||
+ $cmd->{execute} eq 'blockdev-snapshot-delete-internal-sync' ||
$cmd->{execute} eq 'snapshot-drive' ) {
$timeout = 10*60; # 10 mins ?
} else {
if ($qga) {
- $qmpcmd = to_json({ execute => 'guest-sync', arguments => { id => int($cmd->{id})}}) .
+ $qmpcmd = to_json({ execute => 'guest-sync-delimited',
+ arguments => { id => int($cmd->{id})}}) .
to_json({ execute => $cmd->{execute}, arguments => $cmd->{arguments}});
} else {
my $raw;
if ($qga) {
- return if $$input !~ s/^([^\n]+}\n[^\n]+})\n(.*)$/$2/so;
+ return if $$input !~ s/^.*\xff([^\n]+}\r?\n[^\n]+})\r?\n(.*)$/$2/so;
$raw = $1;
} else {
- return if $$input !~ s/^([^\n]+})\r?\n(.*)$/$2/so;
+ return if $$input !~ s/^(.*})\r?\n(.*)$/$2/so;
$raw = $1;
}
my $cmdid = $obj->{'return'};
die "received responsed without command id\n" if !$cmdid;
+
+ # skip results fro previous commands
+ return if $cmdid < $curcmd->{id};
if ($curcmd->{id} ne $cmdid) {
die "got wrong command id '$cmdid' (expected $curcmd->{id})\n";
if ($qga && $qga_allow_close_cmds->{$curcmd->{execute}}) {
- return if $$input !~ s/^([^\n]+})\n(.*)$/$2/so;
+ return if $$input !~ s/^.*\xff([^\n]+})\r?\n(.*)$/$2/so;
my $raw = $1;