From patchwork Sun Mar 28 09:50:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 48776 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 41D04B7CFD for ; Sun, 28 Mar 2010 21:02:58 +1100 (EST) Received: from localhost ([127.0.0.1]:37069 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NvpIT-0004LD-Ij for incoming@patchwork.ozlabs.org; Sun, 28 Mar 2010 06:00:45 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nvp8U-0002CC-I0 for qemu-devel@nongnu.org; Sun, 28 Mar 2010 05:50:26 -0400 Received: from [140.186.70.92] (port=46124 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nvp8S-0002B4-JC for qemu-devel@nongnu.org; Sun, 28 Mar 2010 05:50:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Nvp8Q-0005wj-Da for qemu-devel@nongnu.org; Sun, 28 Mar 2010 05:50:24 -0400 Received: from moutng.kundenserver.de ([212.227.17.10]:53116) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Nvp8Q-0005vm-1G for qemu-devel@nongnu.org; Sun, 28 Mar 2010 05:50:22 -0400 Received: from flocke.weilnetz.de (p54ADF74D.dip.t-dialin.net [84.173.247.77]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0LeQDB-1NEmHZ2iCr-00qfUr; Sun, 28 Mar 2010 11:50:20 +0200 Received: from stefan by flocke.weilnetz.de with local (Exim 4.71) (envelope-from ) id 1Nvp8N-0001xp-S8; Sun, 28 Mar 2010 11:50:19 +0200 From: Stefan Weil To: QEMU Developers Date: Sun, 28 Mar 2010 11:50:19 +0200 Message-Id: <1269769819-7521-1-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.7.0 X-Provags-ID: V01U2FsdGVkX19RcyTDgOjIQec30/cwIfO1232P8aOyezXIr5f OFBKiHAiEtYJGJZUnA6YmJXVwKjAN0A4071XfxBJabLsPJnrax pYiga2HsqQxdbbk47PBrM3SOx9Xv7icBZgHJ0yTVfX0Bie5TXB sVA== X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PATCH] Documentation: Update chapter on installation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org * Replace broken links by link to QEMU wiki. * Separate sections for Linux / Windows / Mac OS X are no longer needed: the wiki link will provide additional links, so we don't need them here. * Add hint for (Open) Solaris. Signed-off-by: Stefan Weil --- qemu-doc.texi | 38 +++++++++++--------------------------- qemu-options.hx | 8 ++++---- 2 files changed, 15 insertions(+), 31 deletions(-) diff --git a/qemu-doc.texi b/qemu-doc.texi index 34182ae..b3a3a9a 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -122,33 +122,17 @@ Alpha, ColdFire(m68k), CRISv32 and MicroBlaze CPUs are supported. If you want to compile QEMU yourself, see @ref{compilation}. -@menu -* install_linux:: Linux -* install_windows:: Windows -* install_mac:: Macintosh -@end menu +Precompiled packages are available for most Linux distributions, +so you just have to install it. -@node install_linux -@section Linux -@cindex installation (Linux) +For other operating systems (Max OS X, Open Solaris, Windows), +binaries are provided by user groups or individuals. -If a precompiled package is available for your distribution - you just -have to install it. Otherwise, see @ref{compilation}. - -@node install_windows -@section Windows -@cindex installation (Windows) - -Download the experimental binary installer at -@url{http://www.free.oszoo.org/@/download.html}. -TODO (no longer available) - -@node install_mac -@section Mac OS X +See @url{http://wiki.qemu.org/Download} for links to binary distributions +and some @ref{disk images} for testing. -Download the experimental binary installer at -@url{http://www.free.oszoo.org/@/download.html}. -TODO (no longer available) +QEMU @ref{disk images} for several guest operating systems are also available +from the FreeOsZoo project (@url{http://www.oszoo.org/}). @node QEMU PC System emulator @chapter QEMU PC System emulator @@ -160,7 +144,7 @@ TODO (no longer available) * sec_invocation:: Invocation * pcsys_keys:: Keys * pcsys_monitor:: QEMU Monitor -* disk_images:: Disk Images +* disk images:: Disk Images * pcsys_network:: Network emulation * direct_linux_boot:: Direct Linux Boot * pcsys_usb:: USB emulation @@ -386,7 +370,7 @@ The monitor understands integers expressions for every integer argument. You can use register names to get the value of specifics CPU registers by prefixing them with @emph{$}. -@node disk_images +@node disk images @section Disk Images Since version 0.6.1, QEMU supports many disk image formats, including @@ -763,7 +747,7 @@ Pointer device that uses absolute coordinates (like a touchscreen). This means qemu is able to report the mouse position without having to grab the mouse. Also overrides the PS/2 mouse emulation when activated. @item disk:@var{file} -Mass storage device based on @var{file} (@pxref{disk_images}) +Mass storage device based on @var{file} (@pxref{disk images}) @item host:@var{bus.addr} Pass through the host device identified by @var{bus.addr} (Linux only) diff --git a/qemu-options.hx b/qemu-options.hx index e2a5ca6..3cfadd9 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -80,7 +80,7 @@ STEXI @item -fdb @var{file} @findex -fda @findex -fdb -Use @var{file} as floppy disk 0/1 image (@pxref{disk_images}). You can +Use @var{file} as floppy disk 0/1 image (@pxref{disk images}). You can use the host floppy by using @file{/dev/fd0} as filename (@pxref{host_drives}). ETEXI @@ -99,7 +99,7 @@ STEXI @findex -hdb @findex -hdc @findex -hdd -Use @var{file} as hard disk 0, 1, 2 or 3 image (@pxref{disk_images}). +Use @var{file} as hard disk 0, 1, 2 or 3 image (@pxref{disk images}). ETEXI DEF("cdrom", HAS_ARG, QEMU_OPTION_cdrom, @@ -126,7 +126,7 @@ Define a new drive. Valid options are: @table @option @item file=@var{file} -This option defines which disk image (@pxref{disk_images}) to use with +This option defines which disk image (@pxref{disk images}) to use with this drive. If the filename contains comma, you must double it (for instance, "file=my,,file" to use file "my,file"). @item if=@var{interface} @@ -300,7 +300,7 @@ STEXI @findex -snapshot Write to temporary files instead of disk image files. In this case, the raw disk image you use is not written back. You can however force -the write back by pressing @key{C-a s} (@pxref{disk_images}). +the write back by pressing @key{C-a s} (@pxref{disk images}). ETEXI DEF("m", HAS_ARG, QEMU_OPTION_m,