From d9605abed68af4b65c4e04386346a2fd372d7ab9 Mon Sep 17 00:00:00 2001 From: Jonathon Jongsma Date: Fri, 20 Mar 2020 17:28:10 -0500 Subject: [PATCH] qemu: fix response timeout for agent guest-sync The agent 'guest-sync' command historically had a 5s response timeout which was different from other agent commands, which waited forever. When we added the ability to customize the response timeout for guest agent commands, we intended to continue to use 5s for 'guest-sync' when the user specified a response timeout greater than 5s, and use the user-specified timeout if it was below 5s. Unfortunately, when attempting to determine whether the user-specified timeout was less than 5s, we were comparing against an enum value of VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT (which is -1) rather than against the actual time value that it represented (5). This change makes it so that 'guest-sync' now uses the user-specified tiemout if it is less than 5s. Signed-off-by: Jonathon Jongsma Reviewed-by: Daniel Henrique Barboza Reviewed-by: Michal Privoznik --- src/qemu/qemu_agent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 0141ddcb5b..0300dff3e5 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -904,7 +904,7 @@ qemuAgentGuestSync(qemuAgentPtr agent) /* if user specified a custom agent timeout that is lower than the * default timeout, use the shorter timeout instead */ - if ((agent->timeout >= 0) && (agent->timeout < timeout)) + if ((agent->timeout >= 0) && (agent->timeout < QEMU_AGENT_WAIT_TIME)) timeout = agent->timeout; memset(&sync_msg, 0, sizeof(sync_msg));