[Qemu-devel] [PULL 31/39] qemu-doc: replace introduction with the one from the internals manual

[Paolo Bonzini]

The user manual has an obsolete introduction, and the one in
the internals manual lists QEMU's features quite nicely.
Drop the obsolete content and remove generic user-level
documentation from qemu-tech.

Reviewed-by: Emilio G. Cota <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
 qemu-doc.texi  | 84 +++++++++++++++++++++++++++++--------------------------
 qemu-tech.texi | 88 ----------------------------------------------------------
 2 files changed, 44 insertions(+), 128 deletions(-)

diff --git a/qemu-doc.texi b/qemu-doc.texi
index f37fd31..9f75c9d 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -57,65 +57,69 @@
 QEMU is a FAST! processor emulator using dynamic translation to
 achieve good emulation speed.
 
address@hidden operating modes
 QEMU has two operating modes:
 
 @itemize
address@hidden operating modes
-
address@hidden
 @cindex system emulation
-Full system emulation. In this mode, QEMU emulates a full system (for
address@hidden Full system emulation. In this mode, QEMU emulates a full system 
(for
 example a PC), including one or several processors and various
 peripherals. It can be used to launch different Operating Systems
 without rebooting the PC or to debug system code.
 
address@hidden
 @cindex user mode emulation
-User mode emulation. In this mode, QEMU can launch
address@hidden User mode emulation. In this mode, QEMU can launch
 processes compiled for one CPU on another CPU. It can be used to
 launch the Wine Windows API emulator (@url{http://www.winehq.org}) or
 to ease cross-compilation and cross-debugging.
 
 @end itemize
 
-QEMU can run without a host kernel driver and yet gives acceptable
-performance.
+QEMU has the following features:
+
address@hidden
address@hidden QEMU can run without a host kernel driver and yet gives 
acceptable
+performance.  It uses dynamic translation to native code for reasonable speed,
+with support for self-modifying code and precise exceptions.
+
address@hidden It is portable to several operating systems (GNU/Linux, *BSD, 
Mac OS X,
+Windows) and architectures.
+
address@hidden It performs accurate software emulation of the FPU.
address@hidden itemize
 
-For system emulation, the following hardware targets are supported:
+QEMU user mode emulation has the following features:
 @itemize
address@hidden emulated target systems
address@hidden supported target systems
address@hidden PC (x86 or x86_64 processor)
address@hidden ISA PC (old style PC without PCI bus)
address@hidden PREP (PowerPC processor)
address@hidden G3 Beige PowerMac (PowerPC processor)
address@hidden Mac99 PowerMac (PowerPC processor, in progress)
address@hidden Sun4m/Sun4c/Sun4d (32-bit Sparc processor)
address@hidden Sun4u/Sun4v (64-bit Sparc processor, in progress)
address@hidden Malta board (32-bit and 64-bit MIPS processors)
address@hidden MIPS Magnum (64-bit MIPS processor)
address@hidden ARM Integrator/CP (ARM)
address@hidden ARM Versatile baseboard (ARM)
address@hidden ARM RealView Emulation/Platform baseboard (ARM)
address@hidden Spitz, Akita, Borzoi, Terrier and Tosa PDAs (PXA270 processor)
address@hidden Luminary Micro LM3S811EVB (ARM Cortex-M3)
address@hidden Luminary Micro LM3S6965EVB (ARM Cortex-M3)
address@hidden Freescale MCF5208EVB (ColdFire V2).
address@hidden Arnewsh MCF5206 evaluation board (ColdFire V2).
address@hidden Palm Tungsten|E PDA (OMAP310 processor)
address@hidden N800 and N810 tablets (OMAP2420 processor)
address@hidden MusicPal (MV88W8618 ARM processor)
address@hidden Gumstix "Connex" and "Verdex" motherboards (PXA255/270).
address@hidden Siemens SX1 smartphone (OMAP310 processor)
address@hidden AXIS-Devboard88 (CRISv32 ETRAX-FS).
address@hidden Petalogix Spartan 3aDSP1800 MMU ref design (MicroBlaze).
address@hidden Avnet LX60/LX110/LX200 boards (Xtensa)
address@hidden Generic Linux system call converter, including most ioctls.
+
address@hidden clone() emulation using native CPU clone() to use Linux 
scheduler for threads.
+
address@hidden Accurate signal handling by remapping host signals to target 
signals.
address@hidden itemize
+
+QEMU full system emulation has the following features:
address@hidden
address@hidden
+QEMU uses a full software MMU for maximum portability.
+
address@hidden
+QEMU can optionally use an in-kernel accelerator, like kvm. The accelerators 
+execute most of the guest code natively, while
+continuing to emulate the rest of the machine.
+
address@hidden
+Various hardware devices can be emulated and in some cases, host
+devices (e.g. serial and parallel ports, USB, drives) can be used
+transparently by the guest Operating System. Host device passthrough
+can be used for talking to external physical peripherals (e.g. a
+webcam, modem or tape drive).
+
address@hidden
+Symmetric multiprocessing (SMP) support.  Currently, an in-kernel
+accelerator is required to use more than one host CPU for emulation.
+
 @end itemize
 
address@hidden supported user mode targets
-For user emulation, x86 (32 and 64 bit), PowerPC (32 and 64 bit),
-ARM, MIPS (32 bit only), Sparc (32 and 64 bit),
-Alpha, ColdFire(m68k), CRISv32 and MicroBlaze CPUs are supported.
 
 @node Installation
 @chapter Installation
diff --git a/qemu-tech.texi b/qemu-tech.texi
index be1c210..2ab7cd4 100644
--- a/qemu-tech.texi
+++ b/qemu-tech.texi
@@ -41,7 +41,6 @@
 @chapter Introduction
 
 @menu
-* intro_features::         Features
 * intro_x86_emulation::    x86 and x86-64 emulation
 * intro_arm_emulation::    ARM emulation
 * intro_mips_emulation::   MIPS emulation
@@ -51,93 +50,6 @@
 * intro_other_emulation::  Other CPU emulation
 @end menu
 
address@hidden intro_features
address@hidden Features
-
-QEMU is a FAST! processor emulator using a portable dynamic
-translator.
-
-QEMU has two operating modes:
-
address@hidden @minus
-
address@hidden
-Full system emulation. In this mode (full platform virtualization),
-QEMU emulates a full system (usually a PC), including a processor and
-various peripherals. It can be used to launch several different
-Operating Systems at once without rebooting the host machine or to
-debug system code.
-
address@hidden
-User mode emulation. In this mode (application level virtualization),
-QEMU can launch processes compiled for one CPU on another CPU, however
-the Operating Systems must match. This can be used for example to ease
-cross-compilation and cross-debugging.
address@hidden itemize
-
-As QEMU requires no host kernel driver to run, it is very safe and
-easy to use.
-
-QEMU generic features:
-
address@hidden
-
address@hidden User space only or full system emulation.
-
address@hidden Using dynamic translation to native code for reasonable speed.
-
address@hidden
-Working on x86, x86_64 and PowerPC32/64 hosts. Being tested on ARM,
-S390x, Sparc32 and Sparc64.
-
address@hidden Self-modifying code support.
-
address@hidden Precise exceptions support.
-
address@hidden
-Floating point library supporting both full software emulation and
-native host FPU instructions.
-
address@hidden itemize
-
-QEMU user mode emulation features:
address@hidden
address@hidden Generic Linux system call converter, including most ioctls.
-
address@hidden clone() emulation using native CPU clone() to use Linux 
scheduler for threads.
-
address@hidden Accurate signal handling by remapping host signals to target 
signals.
address@hidden itemize
-
-Linux user emulator (Linux host only) can be used to launch the Wine
-Windows API emulator (@url{http://www.winehq.org}). A BSD user emulator for BSD
-hosts is under development. It would also be possible to develop a
-similar user emulator for Solaris.
-
-QEMU full system emulation features:
address@hidden
address@hidden
-QEMU uses a full software MMU for maximum portability.
-
address@hidden
-QEMU can optionally use an in-kernel accelerator, like kvm. The accelerators 
-execute some of the guest code natively, while
-continuing to emulate the rest of the machine.
-
address@hidden
-Various hardware devices can be emulated and in some cases, host
-devices (e.g. serial and parallel ports, USB, drives) can be used
-transparently by the guest Operating System. Host device passthrough
-can be used for talking to external physical peripherals (e.g. a
-webcam, modem or tape drive).
-
address@hidden
-Symmetric multiprocessing (SMP) even on a host with a single CPU. On a
-SMP host system, QEMU can use only one CPU fully due to difficulty in
-implementing atomic memory accesses efficiently.
-
address@hidden itemize
-
 @node intro_x86_emulation
 @section x86 and x86-64 emulation
 
-- 
2.7.4