External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-21 03:55:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: Remove redundant parameter from qemuAgentSend

Browse Source 
The @timeout parameter of qemuAgentSend is both redundant and confusing.
This patch should not result in any functional changes.
This commit is contained in:
Jiri Denemark 2012-08-30 14:19:02 +02:00
parent b3bd5d6c5a
commit e360a96067
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/qemu/qemu_agent.c
View File

@ -832,19 +832,22 @@ void qemuAgentClose(qemuAgentPtr mon)
virObjectUnref(mon); virObjectUnref(mon);
} }
#define QEMU_AGENT_WAIT_TIME (1000ull * 5) #define QEMU_AGENT_WAIT_TIME 5
/** /**
* qemuAgentSend: * qemuAgentSend:
* @mon: Monitor * @mon: Monitor
* @msg: Message * @msg: Message
* @timeout: use timeout? * @seconds: number of seconds to wait for the result, it can be either
* @seconds: timeout seconds. if VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT and * -2, -1, 0 or positive.
* @timeout is true, use default value.
* *
* Send @msg to agent @mon. * Send @msg to agent @mon. If @seconds is equal to
* Wait max QEMU_AGENT_WAIT_TIME for agent * VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK(-2), this function will block forever
* to reply. * waiting for the result. The value of
* VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT(-1) means use default timeout value
* and VIR_DOMAIN_QEMU_AGENT_COMMAND_NOWAIT(0) makes this this function return
* immediately without waiting. Any positive value means the number of seconds
* to wait for the result.
* *
* Returns: 0 on success, * Returns: 0 on success,
* -2 on timeout, * -2 on timeout,
@ -852,11 +855,10 @@ void qemuAgentClose(qemuAgentPtr mon)
*/ */
static int qemuAgentSend(qemuAgentPtr mon, static int qemuAgentSend(qemuAgentPtr mon,
qemuAgentMessagePtr msg, qemuAgentMessagePtr msg,
bool timeout,
int seconds) int seconds)
{ {
int ret = -1; int ret = -1;
unsigned long long now, then = 0; unsigned long long then = 0;
/* Check whether qemu quit unexpectedly */ /* Check whether qemu quit unexpectedly */
if (mon->lastError.code != VIR_ERR_OK) { if (mon->lastError.code != VIR_ERR_OK) {
@ -866,21 +868,21 @@ static int qemuAgentSend(qemuAgentPtr mon,
return -1; return -1;
} }
if (timeout) { if (seconds > VIR_DOMAIN_QEMU_AGENT_COMMAND_BLOCK) {
unsigned long long now;
if (virTimeMillisNow(&now) < 0) if (virTimeMillisNow(&now) < 0)
return -1; return -1;
if (!(seconds >= 0 || seconds == VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT)) if (seconds == VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT)
return -1; seconds = QEMU_AGENT_WAIT_TIME;
then = now + (seconds == VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT ? then = now + seconds * 1000ull;
QEMU_AGENT_WAIT_TIME : seconds * 1000ull);
} }
mon->msg = msg; mon->msg = msg;
qemuAgentUpdateWatch(mon); qemuAgentUpdateWatch(mon);
while (!mon->msg->finished) { while (!mon->msg->finished) {
if ((timeout && virCondWaitUntil(&mon->notify, &mon->lock, then) < 0) || if ((then && virCondWaitUntil(&mon->notify, &mon->lock, then) < 0) ||
(!timeout && virCondWait(&mon->notify, &mon->lock) < 0)) { (!then && virCondWait(&mon->notify, &mon->lock) < 0)) {
if (errno == ETIMEDOUT) { if (errno == ETIMEDOUT) {
virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s", virReportError(VIR_ERR_AGENT_UNRESPONSIVE, "%s",
_("Guest agent not available for now")); _("Guest agent not available for now"));
@ -945,7 +947,7 @@ qemuAgentGuestSync(qemuAgentPtr mon)
VIR_DEBUG("Sending guest-sync command with ID: %llu", id); VIR_DEBUG("Sending guest-sync command with ID: %llu", id);
send_ret = qemuAgentSend(mon, &sync_msg, true, send_ret = qemuAgentSend(mon, &sync_msg,
VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT); VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT);
VIR_DEBUG("qemuAgentSend returned: %d", send_ret); VIR_DEBUG("qemuAgentSend returned: %d", send_ret);
@ -1015,7 +1017,7 @@ qemuAgentCommand(qemuAgentPtr mon,
VIR_DEBUG("Send command '%s' for write, seconds = %d", cmdstr, seconds); VIR_DEBUG("Send command '%s' for write, seconds = %d", cmdstr, seconds);
ret = qemuAgentSend(mon, &msg, seconds < -1 ? false : true, seconds); ret = qemuAgentSend(mon, &msg, seconds);
VIR_DEBUG("Receive command reply ret=%d rxObject=%p", VIR_DEBUG("Receive command reply ret=%d rxObject=%p",
ret, msg.rxObject); ret, msg.rxObject);