[Qemu-devel] [PATCH] qemu-doc.texi: Replace remaining obsolete -M option

[Qemu-devel] [PATCH] qemu-doc.texi: Replace remaining obsolete -M option

[mrezanin]

From: Miroslav Rezanina <mrezanin@redhat.com>

When -M option was deprecated (commit 80f52a6) and removed from documentation,
two occurrencies were not updated corectly. Fixing them.

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
---
 qemu-doc.texi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qemu-doc.texi b/qemu-doc.texi
index ad31f2d..a7eab5c 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -2047,7 +2047,7 @@ qemu-system-sparc -prom-env 'auto-boot?=false' \
  -prom-env 'boot-device=sd(0,2,0):d' -prom-env 'boot-args=linux single'
 @end example
 
-@item -M [SS-4|SS-5|SS-10|SS-20|SS-600MP|LX|Voyager|SPARCClassic] [|SPARCbook]
+@item -machine [SS-4|SS-5|SS-10|SS-20|SS-600MP|LX|Voyager|SPARCClassic] [|SPARCbook]
 
 Set the emulated machine type. Default is SS-5.
 
@@ -2097,7 +2097,7 @@ Set OpenBIOS variables in NVRAM, for example:
 qemu-system-sparc64 -prom-env 'auto-boot?=false'
 @end example
 
-@item -M [sun4u|sun4v|Niagara]
+@item -machine [sun4u|sun4v|Niagara]
 
 Set the emulated machine type. The default is sun4u.
 
-- 
1.8.5.3

Re: [Qemu-devel] [PATCH] qemu-doc.texi: Replace remaining obsolete -M option

[Eric Blake]

[-- Attachment #1: Type: text/plain, Size: 1307 bytes --]

On 03/14/2014 06:08 AM, mrezanin@redhat.com wrote:
> From: Miroslav Rezanina <mrezanin@redhat.com>
> 
> When -M option was deprecated (commit 80f52a6) and removed from documentation,
> two occurrencies were not updated corectly. Fixing them.

s/occurrencies/occurrences/
s/corectly/correctly/

> 
> Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
> ---
>  qemu-doc.texi | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 

>  
> -@item -M [SS-4|SS-5|SS-10|SS-20|SS-600MP|LX|Voyager|SPARCClassic] [|SPARCbook]
> +@item -machine [SS-4|SS-5|SS-10|SS-20|SS-600MP|LX|Voyager|SPARCClassic] [|SPARCbook]

Pre-existing, but -M doesn't take two arguments.  I think SPARCbook was
supposed to be part of the earlier list, therefore,

s/] [//

With that change,
Reviewed-by: Eric Blake <eblake@redhat.com>

>  
>  Set the emulated machine type. Default is SS-5.
>  
> @@ -2097,7 +2097,7 @@ Set OpenBIOS variables in NVRAM, for example:
>  qemu-system-sparc64 -prom-env 'auto-boot?=false'
>  @end example
>  
> -@item -M [sun4u|sun4v|Niagara]
> +@item -machine [sun4u|sun4v|Niagara]
>  
>  Set the emulated machine type. The default is sun4u.
>  
> 

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]