From f0002f62f1be78cf00db6f04ef22b90f26e8c6ae Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Fri, 13 Jul 2012 12:36:40 +0200
Subject: [PATCH] fix command timeout

---
 PVE/QMPClient.pm | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/PVE/QMPClient.pm b/PVE/QMPClient.pm
index b4c7936..85d307e 100755
--- a/PVE/QMPClient.pm
+++ b/PVE/QMPClient.pm
@@ -50,7 +50,7 @@ sub queue_cmd {
 
 # execute a single command
 sub cmd {
-    my ($self, $vmid, $cmd) = @_;
+    my ($self, $vmid, $cmd, $timeout) = @_;
 
     my $result;
 
@@ -59,12 +59,23 @@ sub cmd {
 	$result = $resp->{'return'};
     };
 
+    die "no command specified" if !($cmd &&  $cmd->{execute});
+
     $cmd->{callback} = $callback;
     $cmd->{arguments} = {} if !defined($cmd->{arguments});
 
     $self->{queue}->{$vmid} = [ $cmd ];
 
-    $self->queue_execute();
+    if (!$timeout) {
+	# hack: monitor sometime blocks
+	if ($cmd->{execute} eq 'query-migrate') {
+	    $timeout = 60*60; # 1 hour
+	} elsif ($cmd->{execute} =~ m/^(eject|change)/) {
+	    $timeout = 60; # note: cdrom mount command is slow
+	}
+    }
+
+    $self->queue_execute($timeout);
 
     my $cmdstr = $cmd->{execute} || '';
     die "VM $vmid qmp command '$cmdstr' failed - $self->{errors}->{$vmid}"
-- 
2.39.2