openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

virsh: Resolve Coverity DEADCODE 

Coverity points out that if 'dom' isn't returned from virDomainQemuAttach,
then the code already jumps to cleanup, so there was no need for the
subsequent if (dom != NULL) check.

I moved the error message about failure into the goto cleanup on failure
and then removed the if (dom != NULL)

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan 2014-09-04 15:42:08 -04:00
parent a893b20eed
commit 60b029c7a0
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/virsh-domain.c
View File

@ -8498,18 +8498,16 @@ cmdQemuAttach(vshControl *ctl, const vshCmd *cmd)
goto cleanup; goto cleanup;
} }
if (!(dom = virDomainQemuAttach(ctl->conn, pid_value, flags))) if (!(dom = virDomainQemuAttach(ctl->conn, pid_value, flags))) {
goto cleanup;
if (dom != NULL) {
vshPrint(ctl, _("Domain %s attached to pid %u\n"),
virDomainGetName(dom), pid_value);
virDomainFree(dom);
ret = true;
} else {
vshError(ctl, _("Failed to attach to pid %u"), pid_value); vshError(ctl, _("Failed to attach to pid %u"), pid_value);
goto cleanup;
} }
vshPrint(ctl, _("Domain %s attached to pid %u\n"),
virDomainGetName(dom), pid_value);
virDomainFree(dom);
ret = true;
cleanup: cleanup:
return ret; return ret;
} }