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

libvirt-qemu: Dispatch errors from virDomainQemuAgentCommand()

Browse Source 
The original implementation didn't follow the established pattern and
did not dispatch errors in case of failure.
This commit is contained in:
Peter Krempa 2013-06-03 16:12:52 +02:00
parent 6e5b36d5d2
commit 0eb2f8aa90
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/libvirt-qemu.c
View File

@ -211,6 +211,7 @@ virDomainQemuAgentCommand(virDomainPtr domain,
unsigned int flags)
{
virConnectPtr conn;
char *ret;
VIR_DEBUG("domain=%p, cmd=%s, timeout=%d, flags=%x",
domain, cmd, timeout, flags);
@ -220,21 +221,26 @@ virDomainQemuAgentCommand(virDomainPtr domain,
virDispatchError(NULL);
return NULL;
}
if (domain->conn->flags & VIR_CONNECT_RO) {
virLibDomainError(NULL, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
return NULL;
}
conn = domain->conn;
if (conn->flags & VIR_CONNECT_RO) {
virLibDomainError(NULL, VIR_ERR_OPERATION_DENIED, __FUNCTION__);
goto error;
}
if (conn->driver->domainQemuAgentCommand) {
return conn->driver->domainQemuAgentCommand(domain, cmd,
timeout, flags);
ret = conn->driver->domainQemuAgentCommand(domain, cmd,
timeout, flags);
if (!ret)
goto error;
return ret;
}
virLibConnError(conn, VIR_ERR_NO_SUPPORT, __FUNCTION__);
/* Copy to connection error object for back compatibility */
error:
virDispatchError(conn);
return NULL;
}