Revert "virsh: add aliases 'boot', 'stop', and 'restart'"

This reverts commits 5f63a5cb42642f945696c51bbce7fdc160325510
and ff86b0c97b0525a2cd26048a0dbf16e600aaeb7b.  After much list
discussion, consensus was that libvirt aliases should be reserved
to correct typos, otherwise it risks confusion.  Rather, we
should implement a way for users to provide their own aliases
as part of their virsh configuration preferences.

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 8c557f6c1a3cc78ee918df3a885335d9e1aed410..cc47383f7dbddb6447a4fe5a94a5fdd620a0aac2 100644 (file)
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -8315,7 +8315,6 @@ const vshCmdDef domManagementCmds[] = {
     {"blockjob", cmdBlockJob, opts_block_job, info_block_job, 0},
     {"blockpull", cmdBlockPull, opts_block_pull, info_block_pull, 0},
     {"blockresize", cmdBlockResize, opts_block_resize, info_block_resize, 0},
-    {"boot", cmdStart, opts_start, info_start, 0},
     {"change-media", cmdChangeMedia, opts_change_media, info_change_media, 0},
 #ifndef WIN32
     {"console", cmdConsole, opts_console, info_console, 0},
@@ -8369,7 +8368,6 @@ const vshCmdDef domManagementCmds[] = {
     {"numatune", cmdNumatune, opts_numatune, info_numatune, 0},
     {"reboot", cmdReboot, opts_reboot, info_reboot, 0},
     {"reset", cmdReset, opts_reset, info_reset, 0},
-    {"restart", cmdReboot, opts_reboot, info_reboot, 0},
     {"restore", cmdRestore, opts_restore, info_restore, 0},
     {"resume", cmdResume, opts_resume, info_resume, 0},
     {"save", cmdSave, opts_save, info_save, 0},
@@ -8386,7 +8384,6 @@ const vshCmdDef domManagementCmds[] = {
     {"setvcpus", cmdSetvcpus, opts_setvcpus, info_setvcpus, 0},
     {"shutdown", cmdShutdown, opts_shutdown, info_shutdown, 0},
     {"start", cmdStart, opts_start, info_start, 0},
-    {"stop", cmdShutdown, opts_shutdown, info_shutdown, 0},
     {"suspend", cmdSuspend, opts_suspend, info_suspend, 0},
     {"ttyconsole", cmdTTYConsole, opts_ttyconsole, info_ttyconsole, 0},
     {"undefine", cmdUndefine, opts_undefine, info_undefine, 0},

diff --git a/tools/virsh.pod b/tools/virsh.pod
index 0984e6e8bdda1a85b35bde8d9d4c7d9f6949c6ae..29be39e0b4afee69b6b52fc6f093ffc66ee1542f 100644 (file)
--- a/tools/virsh.pod
+++ b/tools/virsh.pod
@@ -1124,14 +1124,11 @@ If I<--config> is specified, affect the next boot of a persistent guest.
 If I<--current> is specified, affect the current guest state.
 
 =item B<reboot> I<domain> [I<--mode acpi|agent>]
-=item B<restart> I<domain> [I<--mode acpi|agent>]
 
-Restart a domain.  Depending on the hypervisor, this may request a
-shutdown followed by a fresh boot, rather than triggering a software
-reboot.  The command returns as soon as it has requested the reboot
-action, and depending on the guest, there may be a significant delay
-before the domain actually reboots, or the request might even be
-ignored.
+Reboot a domain.  This acts just as if the domain had the B<reboot>
+command run from the console.  The command returns as soon as it has
+executed the reboot action, which may be significantly before the
+domain actually reboots.
 
 The exact behavior of a domain when it reboots is set by the
 I<on_reboot> parameter in the domain's XML definition.
@@ -1140,8 +1137,6 @@ By default the hypervisor will try to pick a suitable shutdown
 method. To specify an alternative method, the I<--mode> parameter
 can specify C<acpi> or C<agent>.
 
-The command B<restart> is an alias for the older B<reboot>.
-
 =item B<reset> I<domain>
 
 Reset a domain immediately without any guest shutdown. B<reset>
@@ -1528,7 +1523,6 @@ be hot-plugged the next time the domain is booted.  As such, it must only be
 used with the I<--config> flag, and not with the I<--live> flag.
 
 =item B<shutdown> I<domain> [I<--mode acpi|agent>]
-=item B<stop> I<domain> [I<--mode acpi|agent>]
 
 Gracefully shuts down a domain.  This coordinates with the domain OS
 to perform graceful shutdown, so there is no guarantee that it will
@@ -1547,12 +1541,8 @@ By default the hypervisor will try to pick a suitable shutdown
 method. To specify an alternative method, the I<--mode> parameter
 can specify C<acpi> or C<agent>.
 
-The command B<stop> is an alias for the older B<shutdown>.
-
 =item B<start> I<domain-name-or-uuid> [I<--console>] [I<--paused>]
 [I<--autodestroy>] [I<--bypass-cache>] [I<--force-boot>]
-=item B<boot> I<domain-name-or-uuid> [I<--console>] [I<--paused>]
-[I<--autodestroy>] [I<--bypass-cache>] [I<--force-boot>]
 
 Start a (previously defined) inactive domain, either from the last
 B<managedsave> state, or via a fresh boot if no managedsave state is
@@ -1566,8 +1556,6 @@ the restore will avoid the file system cache, although this may slow
 down the operation.  If I<--force-boot> is specified, then any
 managedsave state is discarded and a fresh boot occurs.
 
-The command B<boot> is an alias for the older B<start>.
-
 =item B<suspend> I<domain>
 
 Suspend a running domain. It is kept in memory but won't be scheduled