NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmdDomIfAddr: Move domain lookup down a few lines

Browse Source 
The 'domifaddr' command accepts several arguments. Let's validate
them first and look up domain to work with only after to save
some RPC cycles should validation fail.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Michal Privoznik 2020-01-03 16:50:02 +01:00
parent 13fa7b587f
commit 44791eaf8b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/virsh-domain-monitor.c
View File

@ -2377,20 +2377,20 @@ cmdDomIfAddr(vshControl *ctl, const vshCmd *cmd)
const char *sourcestr = NULL; const char *sourcestr = NULL;
int source = VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE; int source = VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_LEASE;
if (!(dom = virshCommandOptDomain(ctl, cmd, NULL)))
return false;
if (vshCommandOptStringReq(ctl, cmd, "interface", &ifacestr) < 0) if (vshCommandOptStringReq(ctl, cmd, "interface", &ifacestr) < 0)
goto cleanup; return false;
if (vshCommandOptStringReq(ctl, cmd, "source", &sourcestr) < 0) if (vshCommandOptStringReq(ctl, cmd, "source", &sourcestr) < 0)
goto cleanup; return false;
if (sourcestr && if (sourcestr &&
(source = virshDomainInterfaceAddressesSourceTypeFromString(sourcestr)) < 0) { (source = virshDomainInterfaceAddressesSourceTypeFromString(sourcestr)) < 0) {
vshError(ctl, _("Unknown data source '%s'"), sourcestr); vshError(ctl, _("Unknown data source '%s'"), sourcestr);
goto cleanup; return false;
} }
if (!(dom = virshCommandOptDomain(ctl, cmd, NULL)))
return false;
if ((ifaces_count = virDomainInterfaceAddresses(dom, &ifaces, source, 0)) < 0) { if ((ifaces_count = virDomainInterfaceAddresses(dom, &ifaces, source, 0)) < 0) {
vshError(ctl, _("Failed to query for interfaces addresses")); vshError(ctl, _("Failed to query for interfaces addresses"));
goto cleanup; goto cleanup;