External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-03 15:43:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix just-broken "virsh start" and "virsh pool-start" commands

Browse Source 
* 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.
This commit is contained in:
Jim Meyering 2008-12-09 21:38:04 +00:00
parent 54f4ed6ba1
commit 3693a02fff
4 changed files with 57 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
Tue Dec 9 2008 22:35:43 +0100 Jim Meyering <meyering@redhat.com>
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 <agx@sigxcpu.org> Tue 9 Dez 2008 21:08:43 CET Guido Günther <agx@sigxcpu.org>
logrotate qemu monitor logs logrotate qemu monitor logs

4
src/virsh.c
View File

@ -1021,7 +1021,7 @@ cmdStart(vshControl *ctl, const vshCmd *cmd)
if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) if (!vshConnectionUsability(ctl, ctl->conn, TRUE))
return FALSE; return FALSE;
if (!(dom = vshCommandOptDomainBy(ctl, cmd, "name", NULL, VSH_BYNAME))) if (!(dom = vshCommandOptDomainBy(ctl, cmd, "domain", NULL, VSH_BYNAME)))
return FALSE; return FALSE;
if (virDomainGetID(dom) != (unsigned int)-1) { if (virDomainGetID(dom) != (unsigned int)-1) {
@ -3693,7 +3693,7 @@ cmdPoolStart(vshControl *ctl, const vshCmd *cmd)
if (!vshConnectionUsability(ctl, ctl->conn, TRUE)) if (!vshConnectionUsability(ctl, ctl->conn, TRUE))
return FALSE; return FALSE;
if (!(pool = vshCommandOptPoolBy(ctl, cmd, "name", NULL, VSH_BYNAME))) if (!(pool = vshCommandOptPoolBy(ctl, cmd, "pool", NULL, VSH_BYNAME)))
return FALSE; return FALSE;
if (virStoragePoolCreate(pool, 0) == 0) { if (virStoragePoolCreate(pool, 0) == 0) {

1
tests/Makefile.am
View File

@ -64,6 +64,7 @@ test_scripts += \
int-overflow \ int-overflow \
read-bufsiz \ read-bufsiz \
read-non-seekable \ read-non-seekable \
start \
undefine \ undefine \
vcpupin vcpupin
virsh-all virsh-all

42
tests/start Executable file
View File

@ -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 <http://www.gnu.org/licenses/>.
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