[pve-devel] [PATCH qemu-server] Fix #2062: New timeout switch for guest cmd

Rhonda D'Vine rhonda at proxmox.com
Mon Feb 11 14:17:06 CET 2019


The guest cmd commands set different timeouts.  Some of those might take
longer, so for debugging purposes it would be useful to allow overriding
the internal timeout setting.

Signed-off-by: Rhonda D'Vine <rhonda at proxmox.com>
---
 PVE/API2/Qemu/Agent.pm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/PVE/API2/Qemu/Agent.pm b/PVE/API2/Qemu/Agent.pm
index 839146c..500188d 100644
--- a/PVE/API2/Qemu/Agent.pm
+++ b/PVE/API2/Qemu/Agent.pm
@@ -155,6 +155,12 @@ sub register_command {
 		description => "The QGA command.",
 		enum => [ sort keys %$guest_agent_commands ],
 	    },
+	    timeout => {
+		description => "Timeout in seconds. Default is to wait forever.",
+		type => 'integer',
+		minimum => 1,
+		optional => 1,
+	    }
 	},
     };
 
@@ -190,7 +196,8 @@ sub register_command {
 	    agent_available($vmid, $conf);
 
 	    my $cmd = $param->{command} // $command;
-	    my $res = PVE::QemuServer::vm_mon_cmd($vmid, "guest-$cmd");
+	    my $res = PVE::QemuServer::vm_mon_cmd($vmid, "guest-$cmd",
+		defined($param->{timeout}) ? (timeout => $param->{timeout}) : () );
 
 	    return { result => $res };
 	}});
-- 
2.11.0




More information about the pve-devel mailing list