From patchwork Fri Mar 14 12:08:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miroslav Rezanina X-Patchwork-Id: 330288 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 84FD92C0086 for ; Fri, 14 Mar 2014 23:08:57 +1100 (EST) Received: from localhost ([::1]:44308 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOQv1-00080k-1t for incoming@patchwork.ozlabs.org; Fri, 14 Mar 2014 08:08:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48038) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOQuh-00080Z-0o for qemu-devel@nongnu.org; Fri, 14 Mar 2014 08:08:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WOQua-0001Rk-Sl for qemu-devel@nongnu.org; Fri, 14 Mar 2014 08:08:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:20146) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WOQua-0001RY-L8 for qemu-devel@nongnu.org; Fri, 14 Mar 2014 08:08:28 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s2EC8RQ7002665 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 14 Mar 2014 08:08:28 -0400 Received: from lws-ntb.brq.redhat.com (ovpn-116-27.ams2.redhat.com [10.36.116.27]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s2EC8PLn028103; Fri, 14 Mar 2014 08:08:26 -0400 From: mrezanin@redhat.com To: qemu-devel@nongnu.org Date: Fri, 14 Mar 2014 13:08:21 +0100 Message-Id: <1394798901-21430-1-git-send-email-mrezanin@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: jan.kiszka@siemens.com, Miroslav Rezanina , armbru@redhat.com Subject: [Qemu-devel] [PATCH] qemu-doc.texi: Replace remaining obsolete -M option X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Miroslav Rezanina When -M option was deprecated (commit 80f52a6) and removed from documentation, two occurrencies were not updated corectly. Fixing them. Signed-off-by: Miroslav Rezanina Reviewed-by: Eric Blake --- 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.