[libvirt] [PATCH] virsh: fix logic bug
Bug introduced in commit 9a0ec36. * tools/virsh.c (cmdUndefine): Add missing line. --- Pushing under the trivial rule. tools/virsh.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 070d461..f995ae6 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1449,6 +1449,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) return false; if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) + return false; has_managed_save = virDomainHasManagedSaveImage(dom, 0); if (has_managed_save < 0) { -- 1.7.4.4
Two copy-and-paste bugs in a row. :( * tools/virsh.c (cmdUndefine): Also avoid dead store. --- Another trivial rule push. tools/virsh.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 4beb274..c282164 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -1519,9 +1519,6 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn)) return false; - if (vshCommandOptString(cmd, "domain", &name) <= 0) - return false; - if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) return false; -- 1.7.4.4
participants (1)
-
Eric Blake