From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54358) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WORO1-0001vb-Uj for qemu-devel@nongnu.org; Fri, 14 Mar 2014 08:38:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WORNx-00035s-2K for qemu-devel@nongnu.org; Fri, 14 Mar 2014 08:38:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40652) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WORNw-00035n-Of for qemu-devel@nongnu.org; Fri, 14 Mar 2014 08:38:48 -0400 Message-ID: <5322F856.9030506@redhat.com> Date: Fri, 14 Mar 2014 06:38:46 -0600 From: Eric Blake MIME-Version: 1.0 References: <1394798901-21430-1-git-send-email-mrezanin@redhat.com> In-Reply-To: <1394798901-21430-1-git-send-email-mrezanin@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="WwH1irsVf0jE5ppIGTObnwCg0UfQrRO9E" Subject: Re: [Qemu-devel] [PATCH] qemu-doc.texi: Replace remaining obsolete -M option List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mrezanin@redhat.com, qemu-devel@nongnu.org Cc: jan.kiszka@siemens.com, armbru@redhat.com This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --WwH1irsVf0jE5ppIGTObnwCg0UfQrRO9E Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 03/14/2014 06:08 AM, mrezanin@redhat.com wrote: > From: Miroslav Rezanina >=20 > When -M option was deprecated (commit 80f52a6) and removed from documen= tation, > two occurrencies were not updated corectly. Fixing them. s/occurrencies/occurrences/ s/corectly/correctly/ >=20 > Signed-off-by: Miroslav Rezanina > --- > qemu-doc.texi | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > =20 > -@item -M [SS-4|SS-5|SS-10|SS-20|SS-600MP|LX|Voyager|SPARCClassic] [|SP= ARCbook] > +@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 > =20 > Set the emulated machine type. Default is SS-5. > =20 > @@ -2097,7 +2097,7 @@ Set OpenBIOS variables in NVRAM, for example: > qemu-system-sparc64 -prom-env 'auto-boot?=3Dfalse' > @end example > =20 > -@item -M [sun4u|sun4v|Niagara] > +@item -machine [sun4u|sun4v|Niagara] > =20 > Set the emulated machine type. The default is sun4u. > =20 >=20 --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --WwH1irsVf0jE5ppIGTObnwCg0UfQrRO9E Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJTIvhWAAoJEKeha0olJ0NqlrsH/jGIwxBoI0sl9+YoNomcqHpp UjSWwyq+XWRFZguR6bejikILGUKRp6O9h+lxYVe08hMV8lQ8E6Re/YxHJaOmE09N CN62zORj/nHF9rldogJHtpXRcaYtOECuDKNYdLeiNK/b65YGWAHvgeGRu4d1afNF pmL2YrOI0u50zF4aXo0tuHXh0bs8Z5cMqlTKiMsYIHDKxNTzi6NPmuEmSRYEcZfc vsr8L7F3+lkI3j/l6y/Kn3zJflIN55dXNAiWNG+DpU/5dIrSrFMYHt8azOxPaA4o bEyQf4qj7/hQygxagH/ESsREHkeFwMqbtQBA2VZJ8tjSrFdYaGKtAL4KmIJEidc= =w5Pe -----END PGP SIGNATURE----- --WwH1irsVf0jE5ppIGTObnwCg0UfQrRO9E--