From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02560C3F2D2 for ; Fri, 28 Feb 2020 15:39:28 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BC9D72469D for ; Fri, 28 Feb 2020 15:39:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="CNWvGD31" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BC9D72469D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48716 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j7hja-0005mC-VO for qemu-devel@archiver.kernel.org; Fri, 28 Feb 2020 10:39:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46724) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j7hgp-0000Xr-Vc for qemu-devel@nongnu.org; Fri, 28 Feb 2020 10:36:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j7hgo-0004mK-Fu for qemu-devel@nongnu.org; Fri, 28 Feb 2020 10:36:35 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:50204) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j7hgo-0004m1-8k for qemu-devel@nongnu.org; Fri, 28 Feb 2020 10:36:34 -0500 Received: by mail-wm1-x32e.google.com with SMTP id a5so3651088wmb.0 for ; Fri, 28 Feb 2020 07:36:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CDwccDAzY6/drcgRgSHMwMIAbEAiD6D8623kndih2do=; b=CNWvGD31fRrVvcA+byofFkS3qU6Fgwx2oO2bMVjw83kzZ2YZs0dSjthHUUjauTdPqU vE81eC3ur9g0k7iHVCWGY3T/UFsFVPxaGnSTfcp69fzUDiH3xj8OtjLPHQ3wAHSeAUBs qbE5rQJQh+Im9BV0H+eQ58W5SFbPV4GzvQ0eJmw1TqQwbG1PJCdWImYiG3tMmWrJqi5s PyfeW5Jod5P/4Ham9F7i4r8+i/tPCyUSuvOfny6zaZ7KM9F5pYLWKWjgcSWV6GnyRPUQ nBWYfxgsi1jg0p4R79oN5N3kEB43YNsP8Fj2LrXTIh23Gs6IgdEyc6frPp/nRLtIr/tD 4Lug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CDwccDAzY6/drcgRgSHMwMIAbEAiD6D8623kndih2do=; b=gznBF6gsWlXdQ91pWB4bXiq+lQd7czyci+SwB/ZoPwLRfwyv3X0a3PJmpVW2Kq8X43 ZmIMRnHbUttpJA/IEGQF0o4AcwG8iwIHWVT61TBtdwrcjayKQIVNP/kU8rJdENHYPmJz aYqbl/vTz76uRxL9x44KXG0XxD5uQsbyX/9ktrggTtbVigue1Elvy5uU8z7Iv6qKp412 TlzrJLzHF/XtZpf+/aM1DN8W950tOk5TZmEDGX2XRvj5QF4p0vbYyOklaoqfTu1rwB4k K0fqCIe98y/BBv78nhpNyDPllb5Rbh19f+OkeKHUt6Eckvu7LD6beG5BFaTRrUGd70E1 AqDQ== X-Gm-Message-State: APjAAAVPFa8JWsEl9QgpIQ7WwhxU/XDYBO7fc4QhHt/AA0fNaCO6Mmw4 CurWL/03ydDm/SLbFaz8+UUITGC3Ycoo8g== X-Google-Smtp-Source: APXvYqzryOxhgY6CB0TD0C9DOGIx8HU/OQWtDuYkZn/nGaG1Cv/iTZr/XotLbmu8n7JdcuRypyJTBQ== X-Received: by 2002:a1c:7315:: with SMTP id d21mr5399071wmb.186.1582904192388; Fri, 28 Feb 2020 07:36:32 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id u23sm2659452wmu.14.2020.02.28.07.36.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2020 07:36:31 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH v3 06/33] qemu-doc: extract common system emulator documentation from the PC section Date: Fri, 28 Feb 2020 15:35:52 +0000 Message-Id: <20200228153619.9906-7-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200228153619.9906-1-peter.maydell@linaro.org> References: <20200228153619.9906-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32e X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , Kashyap Chamarthy Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini Move the section on PC peripherals together with other targets. While some x86-specific information remains in the main system emulation chapter, it can be tackled more easily a section at a time. Signed-off-by: Paolo Bonzini Message-id: 20200226113034.6741-7-pbonzini@redhat.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- docs/system/quickstart.texi | 2 +- qemu-doc.texi | 102 ++++++++++++++++++++---------------- 2 files changed, 57 insertions(+), 47 deletions(-) diff --git a/docs/system/quickstart.texi b/docs/system/quickstart.texi index 8cd5b4bc6e5..ed7295de7a2 100644 --- a/docs/system/quickstart.texi +++ b/docs/system/quickstart.texi @@ -2,7 +2,7 @@ @section Quick Start @cindex quick start -Download and uncompress a hard disk image with Linux installed (e.g. +Download and uncompress a PC hard disk image with Linux installed (e.g. @file{linux.img}) and type: @example diff --git a/qemu-doc.texi b/qemu-doc.texi index 33d24caf946..88e84300e91 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -36,8 +36,8 @@ @menu * Introduction:: -* QEMU PC System emulator:: -* QEMU System emulator for non PC targets:: +* QEMU System emulator:: +* QEMU System emulator targets:: * System requirements:: * Security:: * Implementation notes:: @@ -127,19 +127,16 @@ accelerator is required to use more than one host CPU for emulation. @end itemize - -@node QEMU PC System emulator -@chapter QEMU PC System emulator -@cindex system emulation (PC) +@node QEMU System emulator +@chapter QEMU System emulator +@cindex system emulation @menu -* pcsys_introduction:: Introduction -* pcsys_quickstart:: Quick Start +* pcsys_quickstart:: Quick start * sec_invocation:: Invocation * pcsys_keys:: Keys in the graphical frontends * mux_keys:: Keys in the character backend multiplexer * pcsys_monitor:: QEMU Monitor -* cpu_models_x86:: Supported CPU model configurations on x86 hosts * disk_images:: Disk Images * pcsys_network:: Network emulation * pcsys_usb:: USB emulation @@ -150,13 +147,57 @@ accelerator is required to use more than one host CPU for emulation. * gdb_usage:: GDB usage @end menu -@node pcsys_introduction -@section Introduction +@include docs/system/quickstart.texi +@include docs/system/invocation.texi +@include docs/system/keys.texi +@include docs/system/mux-chardev.texi +@include docs/system/monitor.texi +@include docs/system/images.texi +@include docs/system/net.texi +@include docs/system/usb.texi +@include docs/system/ivshmem.texi +@include docs/system/linuxboot.texi +@include docs/system/vnc-security.texi +@include docs/system/tls.texi +@include docs/system/gdb.texi + +@node QEMU System emulator targets +@chapter QEMU System emulator targets +@cindex system emulation (PC) + +QEMU is a generic emulator and it emulates many machines. Most of the +options are similar for all machines. Specific information about the +various targets are mentioned in the following sections. + +@menu +* x86 (PC) System emulator:: +* PowerPC System emulator:: +* Sparc32 System emulator:: +* Sparc64 System emulator:: +* MIPS System emulator:: +* ARM System emulator:: +* ColdFire System emulator:: +* Cris System emulator:: +* Microblaze System emulator:: +* SH4 System emulator:: +* Xtensa System emulator:: +@end menu + +@node x86 (PC) System emulator +@section x86 (PC) System emulator +@cindex system emulation (PC) + +@menu +* pcsys_devices:: Peripherals +* cpu_models_x86:: Supported CPU model configurations on x86 hosts +@end menu + +@node pcsys_devices +@subsection Peripherals @c man begin DESCRIPTION -The QEMU PC System emulator simulates the -following peripherals: +The QEMU PC System emulator simulates the following peripherals: @itemize @minus @item @@ -222,40 +263,9 @@ CS4231A is the chip used in Windows Sound System and GUSMAX products @c man end -@include docs/system/quickstart.texi -@include docs/system/invocation.texi -@include docs/system/keys.texi -@include docs/system/mux-chardev.texi -@include docs/system/monitor.texi +@lowersections @include docs/system/cpu-models-x86.texi -@include docs/system/images.texi -@include docs/system/net.texi -@include docs/system/usb.texi -@include docs/system/ivshmem.texi -@include docs/system/linuxboot.texi -@include docs/system/vnc-security.texi -@include docs/system/tls.texi -@include docs/system/gdb.texi - -@node QEMU System emulator for non PC targets -@chapter QEMU System emulator for non PC targets - -QEMU is a generic emulator and it emulates many non PC -machines. Most of the options are similar to the PC emulator. The -differences are mentioned in the following sections. - -@menu -* PowerPC System emulator:: -* Sparc32 System emulator:: -* Sparc64 System emulator:: -* MIPS System emulator:: -* ARM System emulator:: -* ColdFire System emulator:: -* Cris System emulator:: -* Microblaze System emulator:: -* SH4 System emulator:: -* Xtensa System emulator:: -@end menu +@raisesections @node PowerPC System emulator @section PowerPC System emulator -- 2.20.1