From 3693a02fffcd4c8fd92f9cd2757425c300e62237 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 9 Dec 2008 21:38:04 +0000 Subject: [PATCH] fix just-broken "virsh start" and "virsh pool-start" commands * src/virsh.c (cmdPoolStart, cmdStart): Change hard-coded vshCommandOptDomainBy string argument to match just-changed option name. Cole Robinson reported that "virsh start" was broken and provided that part of the fix. Bug introduced by yesterday's "virsh.c: tweak options to produce more accurate help". * tests/start: New file. Test for the above fix. * tests/Makefile.am (test_scripts): Add start. --- ChangeLog | 12 ++++++++++++ src/virsh.c | 4 ++-- tests/Makefile.am | 1 + tests/start | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 2 deletions(-) create mode 100755 tests/start diff --git a/ChangeLog b/ChangeLog index a9332a3a55..6d964ae007 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Tue Dec 9 2008 22:35:43 +0100 Jim Meyering + + fix just-broken "virsh start" and "virsh pool-start" commands + * src/virsh.c (cmdPoolStart, cmdStart): Change hard-coded + vshCommandOptDomainBy string argument to match just-changed + option name. Cole Robinson reported that "virsh start" was + broken and provided that part of the fix. + Bug introduced by yesterday's "virsh.c: tweak options to produce + more accurate help". + * tests/start: New file. Test for the above fix. + * tests/Makefile.am (test_scripts): Add start. + Tue 9 Dez 2008 21:08:43 CET Guido Günther logrotate qemu monitor logs diff --git a/src/virsh.c b/src/virsh.c index bb81f25bd0..1a5b42fcf5 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -1021,7 +1021,7 @@ cmdStart(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(dom = vshCommandOptDomainBy(ctl, cmd, "name", NULL, VSH_BYNAME))) + if (!(dom = vshCommandOptDomainBy(ctl, cmd, "domain", NULL, VSH_BYNAME))) return FALSE; if (virDomainGetID(dom) != (unsigned int)-1) { @@ -3693,7 +3693,7 @@ cmdPoolStart(vshControl *ctl, const vshCmd *cmd) if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) return FALSE; - if (!(pool = vshCommandOptPoolBy(ctl, cmd, "name", NULL, VSH_BYNAME))) + if (!(pool = vshCommandOptPoolBy(ctl, cmd, "pool", NULL, VSH_BYNAME))) return FALSE; if (virStoragePoolCreate(pool, 0) == 0) { diff --git a/tests/Makefile.am b/tests/Makefile.am index fd319e11aa..9e794c58c3 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -64,6 +64,7 @@ test_scripts += \ int-overflow \ read-bufsiz \ read-non-seekable \ + start \ undefine \ vcpupin virsh-all diff --git a/tests/start b/tests/start new file mode 100755 index 0000000000..a436f9b3ea --- /dev/null +++ b/tests/start @@ -0,0 +1,42 @@ +#!/bin/sh +# ensure that virsh start works properly + +# Copyright (C) 2008 Free Software Foundation, Inc. + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +if test "$VERBOSE" = yes; then + set -x + virsh --version +fi + +test -z "$srcdir" && srcdir=$(pwd) +test -z "$abs_top_srcdir" && abs_top_srcdir=$(pwd)/.. +. "$srcdir/test-lib.sh" + +fail=0 + +test_url=test:///default + +# expect this to fail +virsh -c $test_url start test > out 2> err && fail=1 + +# stdout gets a newline +echo > exp || fail=1 +compare out exp || fail=1 + +echo 'error: Domain is already active' > exp || fail=1 +compare err exp || fail=1 + +(exit $fail); exit $fail