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@xxxxxxxxxx>
---
tools/virsh-domain.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 1cdb596..f732a6e 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -8260,18 +8260,16 @@ cmdQemuAttach(vshControl *ctl, const vshCmd *cmd)
goto cleanup;
}
- 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 {
+ if (!(dom = virDomainQemuAttach(ctl->conn, pid_value, flags))) {
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:
return ret;
}
--
1.9.3
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list