From 60b029c7a0e934278e50d428a22da0119d62c7f6 Mon Sep 17 00:00:00 2001 From: John Ferlan Date: Thu, 4 Sep 2014 15:42:08 -0400 Subject: [PATCH] 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 --- 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 3169b45b05..cc1e5546fd 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -8498,18 +8498,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; }