From nobody Sun Oct 5 14:30:45 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1583493108; cv=none; d=zohomail.com; s=zohoarc; b=cbmoE9YnwL9EsR9zbxrIhf+6DkQ3VTDah03n1MO7nFQ3M56RkBCu40rFDPqjb5D9mTNuNIHFsKrAHBnzKzXRdtHOvroQdeoDYExN76henyTpNLrKuuPVU5/9RvjXuWf62MIpIPOfzFtrgE2mZXiXIVBcdeNL4q0InTCZeRNjslU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1583493108; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=+alVn5X3OOkgV90SEVlhjeilG8dCZZxnIP3dAp4eTZk=; b=fK3Y8kE8jq3ZZoF35MN+FrS+ShjP4Ku6shOk/1nT60Jd8SRXM572fNnKwcJSFYJEOK1/6JXP7fNl0wkMf8bNOAYDzNo4OMpaSW2naEX79obPHdjnSMd0h65gHF6jm81INjWcBeQQM5SPVdR2Jff0lTkQ6Vq9qu5iBOvEtqDpnPk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1583493108384175.2983468392115; Fri, 6 Mar 2020 03:11:48 -0800 (PST) Received: from localhost ([::1]:34746 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAAtP-0005JT-8S for importer@patchew.org; Fri, 06 Mar 2020 06:11:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38892) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAArs-00039w-H1 for qemu-devel@nongnu.org; Fri, 06 Mar 2020 06:10:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAArp-0004MH-8H for qemu-devel@nongnu.org; Fri, 06 Mar 2020 06:10:12 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:42012) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jAAro-0004I0-UN for qemu-devel@nongnu.org; Fri, 06 Mar 2020 06:10:09 -0500 Received: by mail-wr1-x42d.google.com with SMTP id v11so1840719wrm.9 for ; Fri, 06 Mar 2020 03:10:08 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id y10sm12553029wma.26.2020.03.06.03.10.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2020 03:10:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=+alVn5X3OOkgV90SEVlhjeilG8dCZZxnIP3dAp4eTZk=; b=lP34HfPw+gI/XWXmW9bQxCDiirtW8yYLWj515Fxr8E4RAfMJh6TxdHnnH7acWukiIo Ju5RBDxeqWRpe8nKbislfYxRD3PbtiWaNkFnpdcdxTxM1wENeqBdt7uY4WlssD3ri8Pp WRoTb4vscE9shKwJWAi7HPPuYyz/BRAeSonXnn9DmPUFzcrA0htC9ZJXb5BGsmcaC6TQ 37oZFgLW0le2MJgfXWrwNje/awF1ihY96bLVZA3J/CQgeJLn0YNAzptcM7QPE3/Wq5z5 UEsc4PlLyIAaBX6WAaR/f9Y9nxhe1UgueaeR5DKw/IcWmhhKr6ZehcHdB7TXCcPyTHiT CPDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+alVn5X3OOkgV90SEVlhjeilG8dCZZxnIP3dAp4eTZk=; b=sYZXl8F6E/6+UJqzXt5X9rqtc2Tj9KpBdZkZJh8i9vJ6AEaWb9KMTZNRqZtxzBnKut mTgj8fPMvLdSHWlwwRvt/um+ngrPFyOgNca1a+ib78ppXWPTXiCVA7W/IR2oOCDpcJHM rC07joZoqd6DGYd1pqG8y1AcMHdakRuCw0aVJO+0brlMuRZx2kksS8jcTDcXyHyCQiGg +v9+D95JFvuEYEegQpLmUlcJW8rf0XFZBr0X4PBBFZH2q8uQeyO4v9ZUmh9+a2j+93yb FkTc4PMyRt/kwYZBmH/A+qv0s/swotD9UQIY4+kNJUNeYOX8JQRpN2X5TxB72KeTRm6w D8VA== X-Gm-Message-State: ANhLgQ1WVkdI2gS0aBivYOn5NElocD4bWjqUSiwkYSaQEzwl25P2CVV7 a7aLUULauvTj2KVURXnJnihf3sfrErwjkg== X-Google-Smtp-Source: ADFU+vvVnWl5ipM8+1fGPbXJCNIu4m7uXR/utpCYAxsnFahtcXooa3K0YvLUJxFlUcqxH5LC36MuGA== X-Received: by 2002:adf:ef4c:: with SMTP id c12mr3720819wrp.249.1583493006968; Fri, 06 Mar 2020 03:10:06 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 04/33] qemu-doc: split CPU models doc between MIPS and x86 parts Date: Fri, 6 Mar 2020 11:09:30 +0000 Message-Id: <20200306110959.29461-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200306110959.29461-1-peter.maydell@linaro.org> References: <20200306110959.29461-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42d 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Paolo Bonzini The MIPS CPU models end up in the middle of the PC documentation. Move them to a separate file so that they can be placed in the right section. The man page still includes both x86 and MIPS content. Signed-off-by: Paolo Bonzini Reviewed-by: Peter Maydell Reviewed-by: Alex Benn=C3=A9e Tested-by: Alex Benn=C3=A9e Signed-off-by: Peter Maydell Message-id: 20200228153619.9906-5-peter.maydell@linaro.org Message-id: 20200226113034.6741-5-pbonzini@redhat.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- Makefile | 11 +- MAINTAINERS | 3 +- docs/system/cpu-models-mips.texi | 157 +++++++++++++ .../cpu-models-x86.texi} | 221 ++---------------- docs/system/qemu-cpu-models.texi | 28 +++ qemu-doc.texi | 12 +- 6 files changed, 213 insertions(+), 219 deletions(-) create mode 100644 docs/system/cpu-models-mips.texi rename docs/{qemu-cpu-models.texi =3D> system/cpu-models-x86.texi} (71%) create mode 100644 docs/system/qemu-cpu-models.texi diff --git a/Makefile b/Makefile index faa0ffa05b0..f75a7b51938 100644 --- a/Makefile +++ b/Makefile @@ -354,7 +354,7 @@ endif DOCS+=3D$(MANUAL_BUILDDIR)/system/qemu-block-drivers.7 DOCS+=3Ddocs/interop/qemu-qmp-ref.html docs/interop/qemu-qmp-ref.txt docs/= interop/qemu-qmp-ref.7 DOCS+=3Ddocs/interop/qemu-ga-ref.html docs/interop/qemu-ga-ref.txt docs/in= terop/qemu-ga-ref.7 -DOCS+=3Ddocs/qemu-cpu-models.7 +DOCS+=3Ddocs/system/qemu-cpu-models.7 DOCS+=3D$(MANUAL_BUILDDIR)/index.html ifdef CONFIG_VIRTFS DOCS+=3D$(MANUAL_BUILDDIR)/tools/virtfs-proxy-helper.1 @@ -780,7 +780,7 @@ distclean: clean rm -f docs/interop/qemu-qmp-ref.txt docs/interop/qemu-ga-ref.txt rm -f docs/interop/qemu-qmp-ref.pdf docs/interop/qemu-ga-ref.pdf rm -f docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-ref.html - rm -f docs/qemu-cpu-models.7 + rm -f docs/system/qemu-cpu-models.7 rm -rf .doctrees $(call clean-manual,devel) $(call clean-manual,interop) @@ -861,7 +861,7 @@ ifdef CONFIG_POSIX $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man7" $(INSTALL_DATA) docs/interop/qemu-qmp-ref.7 "$(DESTDIR)$(mandir)/man7" $(INSTALL_DATA) $(MANUAL_BUILDDIR)/system/qemu-block-drivers.7 "$(DESTDIR= )$(mandir)/man7" - $(INSTALL_DATA) docs/qemu-cpu-models.7 "$(DESTDIR)$(mandir)/man7" + $(INSTALL_DATA) docs/system/qemu-cpu-models.7 "$(DESTDIR)$(mandir)/man7" ifeq ($(CONFIG_TOOLS),y) $(INSTALL_DATA) $(MANUAL_BUILDDIR)/tools/qemu-img.1 "$(DESTDIR)$(mandir)/= man1" $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man8" @@ -1111,7 +1111,7 @@ docs/interop/qemu-ga-qapi.texi: qga/qapi-generated/qg= a-qapi-doc.texi =20 qemu.1: qemu-doc.texi qemu-options.texi qemu-monitor.texi qemu-monitor-inf= o.texi qemu.1: qemu-option-trace.texi -docs/qemu-cpu-models.7: docs/qemu-cpu-models.texi +docs/system/qemu-cpu-models.7: docs/system/qemu-cpu-models.texi docs/syste= m/cpu-models-x86.texi docs/system/cpu-models-mips.texi =20 html: qemu-doc.html docs/interop/qemu-qmp-ref.html docs/interop/qemu-ga-re= f.html sphinxdocs info: qemu-doc.info docs/interop/qemu-qmp-ref.info docs/interop/qemu-ga-re= f.info @@ -1123,7 +1123,8 @@ qemu-doc.html qemu-doc.info qemu-doc.pdf qemu-doc.txt= : \ qemu-tech.texi qemu-option-trace.texi \ qemu-deprecated.texi qemu-monitor.texi \ qemu-monitor-info.texi \ - docs/qemu-cpu-models.texi docs/security.texi + docs/system/cpu-models-x86.texi docs/system/cpu-models-mips.texi \ + docs/security.texi =20 docs/interop/qemu-ga-ref.dvi docs/interop/qemu-ga-ref.html \ docs/interop/qemu-ga-ref.info docs/interop/qemu-ga-ref.pdf \ diff --git a/MAINTAINERS b/MAINTAINERS index c258391cad8..615615c32f3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -215,6 +215,7 @@ S: Maintained F: target/mips/ F: default-configs/*mips* F: disas/*mips* +F: docs/system/cpu-models-mips.texi F: hw/intc/mips_gic.c F: hw/mips/ F: hw/misc/mips_* @@ -319,7 +320,7 @@ F: tests/tcg/i386/ F: tests/tcg/x86_64/ F: hw/i386/ F: disas/i386.c -F: docs/qemu-cpu-models.texi +F: docs/system/cpu-models-x86.texi T: git https://github.com/ehabkost/qemu.git x86-next =20 Xtensa TCG CPUs diff --git a/docs/system/cpu-models-mips.texi b/docs/system/cpu-models-mips= .texi new file mode 100644 index 00000000000..6a0370cb693 --- /dev/null +++ b/docs/system/cpu-models-mips.texi @@ -0,0 +1,157 @@ +@node recommendations_cpu_models_MIPS +@section Supported CPU model configurations on MIPS hosts + +QEMU supports variety of MIPS CPU models: + +@menu +* cpu_models_MIPS32:: Supported CPU models for MIPS32 hosts +* cpu_models_MIPS64:: Supported CPU models for MIPS64 hosts +* cpu_models_nanoMIPS:: Supported CPU models for nanoMIPS hosts +* preferred_cpu_models_MIPS:: Preferred CPU models for MIPS hosts +@end menu + +@node cpu_models_MIPS32 +@subsection Supported CPU models for MIPS32 hosts + +The following CPU models are supported for use on MIPS32 hosts. Administra= tors / +applications are recommended to use the CPU model that matches the generat= ion +of the host CPUs in use. In a deployment with a mixture of host CPU models +between machines, if live migration compatibility is required, use the new= est +CPU model that is compatible across all desired hosts. + +@table @option +@item @code{mips32r6-generic} + +MIPS32 Processor (Release 6, 2015) + + +@item @code{P5600} + +MIPS32 Processor (P5600, 2014) + + +@item @code{M14K} +@item @code{M14Kc} + +MIPS32 Processor (M14K, 2009) + + +@item @code{74Kf} + +MIPS32 Processor (74K, 2007) + + +@item @code{34Kf} + +MIPS32 Processor (34K, 2006) + + +@item @code{24Kc} +@item @code{24KEc} +@item @code{24Kf} + +MIPS32 Processor (24K, 2003) + + +@item @code{4Kc} +@item @code{4Km} +@item @code{4KEcR1} +@item @code{4KEmR1} +@item @code{4KEc} +@item @code{4KEm} + +MIPS32 Processor (4K, 1999) +@end table + +@node cpu_models_MIPS64 +@subsection Supported CPU models for MIPS64 hosts + +The following CPU models are supported for use on MIPS64 hosts. Administra= tors / +applications are recommended to use the CPU model that matches the generat= ion +of the host CPUs in use. In a deployment with a mixture of host CPU models +between machines, if live migration compatibility is required, use the new= est +CPU model that is compatible across all desired hosts. + +@table @option +@item @code{I6400} + +MIPS64 Processor (Release 6, 2014) + + +@item @code{Loongson-2F} + +MIPS64 Processor (Loongson 2, 2008) + + +@item @code{Loongson-2E} + +MIPS64 Processor (Loongson 2, 2006) + + +@item @code{mips64dspr2} + +MIPS64 Processor (Release 2, 2006) + + +@item @code{MIPS64R2-generic} +@item @code{5KEc} +@item @code{5KEf} + +MIPS64 Processor (Release 2, 2002) + + +@item @code{20Kc} + +MIPS64 Processor (20K, 2000) + + +@item @code{5Kc} +@item @code{5Kf} + +MIPS64 Processor (5K, 1999) + + +@item @code{VR5432} + +MIPS64 Processor (VR, 1998) + + +@item @code{R4000} + +MIPS64 Processor (MIPS III, 1991) +@end table + +@node cpu_models_nanoMIPS +@subsection Supported CPU models for nanoMIPS hosts + +The following CPU models are supported for use on nanoMIPS hosts. Administ= rators / +applications are recommended to use the CPU model that matches the generat= ion +of the host CPUs in use. In a deployment with a mixture of host CPU models +between machines, if live migration compatibility is required, use the new= est +CPU model that is compatible across all desired hosts. + +@table @option +@item @code{I7200} + +MIPS I7200 (nanoMIPS, 2018) + +@end table + +@node preferred_cpu_models_MIPS +@subsection Preferred CPU models for MIPS hosts + +The following CPU models are preferred for use on different MIPS hosts: + +@table @option +@item @code{MIPS III} +R4000 + +@item @code{MIPS32R2} +34Kf + +@item @code{MIPS64R6} +I6400 + +@item @code{nanoMIPS} +I7200 +@end table diff --git a/docs/qemu-cpu-models.texi b/docs/system/cpu-models-x86.texi similarity index 71% rename from docs/qemu-cpu-models.texi rename to docs/system/cpu-models-x86.texi index f88a1def0d0..0cd64b0522e 100644 --- a/docs/qemu-cpu-models.texi +++ b/docs/system/cpu-models-x86.texi @@ -1,16 +1,5 @@ -@c man begin SYNOPSIS -QEMU / KVM CPU model configuration -@c man end - -@set qemu_system_x86 qemu-system-x86_64 - -@c man begin DESCRIPTION - -@menu -* recommendations_cpu_models_x86:: Recommendations for KVM CPU model conf= iguration on x86 hosts -* recommendations_cpu_models_MIPS:: Supported CPU model configurations on = MIPS hosts -* cpu_model_syntax_apps:: Syntax for configuring CPU models -@end menu +@node cpu_models_x86 +@section Recommendations for KVM CPU model configuration on x86 hosts =20 QEMU / KVM virtualization supports two ways to configure CPU models =20 @@ -45,9 +34,6 @@ stepping, etc will precisely match the host CPU, as they = would with "Host passthrough", but gives much of the benefit of passthrough, while making live migration safe. =20 -@node recommendations_cpu_models_x86 -@subsection Recommendations for KVM CPU model configuration on x86 hosts - The information that follows provides recommendations for configuring CPU models on x86 hosts. The goals are to maximise performance, while protecting guest OS against various CPU hardware flaws, and optionally @@ -60,10 +46,11 @@ enabling live migration between hosts with heterogeneou= s CPU models. * important_cpu_features_amd_x86:: Important CPU features for AMD x8= 6 hosts * default_cpu_models_x86:: Default x86 CPU models * other_non_recommended_cpu_models_x86:: Other non-recommended x86 CPUs +* cpu_model_syntax_apps:: Syntax for configuring CPU models @end menu =20 @node preferred_cpu_models_intel_x86 -@subsubsection Preferred CPU models for Intel x86 hosts +@subsection Preferred CPU models for Intel x86 hosts =20 The following CPU models are preferred for use on Intel hosts. Administrat= ors / applications are recommended to use the CPU model that matches the generat= ion @@ -136,7 +123,7 @@ Intel Celeron_4x0 (Conroe/Merom Class Core 2, 2006) @end table =20 @node important_cpu_features_intel_x86 -@subsubsection Important CPU features for Intel x86 hosts +@subsection Important CPU features for Intel x86 hosts =20 The following are important CPU features that should be used on Intel x86 hosts, when available in the host CPU. Some of them require explicit @@ -218,7 +205,7 @@ can be used for guest CPUs. =20 =20 @node preferred_cpu_models_amd_x86 -@subsubsection Preferred CPU models for AMD x86 hosts +@subsection Preferred CPU models for AMD x86 hosts =20 The following CPU models are preferred for use on Intel hosts. Administrat= ors / applications are recommended to use the CPU model that matches the generat= ion @@ -260,7 +247,7 @@ AMD Opteron 240 (Gen 1 Class Opteron, 2004) @end table =20 @node important_cpu_features_amd_x86 -@subsubsection Important CPU features for AMD x86 hosts +@subsection Important CPU features for AMD x86 hosts =20 The following are important CPU features that should be used on AMD x86 hosts, when available in the host CPU. Some of them require explicit @@ -349,7 +336,7 @@ Note that not all CPU hardware will support this featur= e. =20 =20 @node default_cpu_models_x86 -@subsubsection Default x86 CPU models +@subsection Default x86 CPU models =20 The default QEMU CPU models are designed such that they can run on all hos= ts. If an application does not wish to do perform any host compatibility checks @@ -372,7 +359,7 @@ qemu64 is used for x86_64 guests and qemu32 is used for= i686 guests, when no =20 =20 @node other_non_recommended_cpu_models_x86 -@subsubsection Other non-recommended x86 CPUs +@subsection Other non-recommended x86 CPUs =20 The following CPUs models are compatible with most AMD and Intel x86 hosts= , but their usage is discouraged, as they expose a very limited featureset, which @@ -403,177 +390,13 @@ hardware assisted virtualization, that should thus n= ot be required for running virtual machines. @end table =20 -@node recommendations_cpu_models_MIPS -@subsection Supported CPU model configurations on MIPS hosts - -QEMU supports variety of MIPS CPU models: - -@menu -* cpu_models_MIPS32:: Supported CPU models for MIPS32 hosts -* cpu_models_MIPS64:: Supported CPU models for MIPS64 hosts -* cpu_models_nanoMIPS:: Supported CPU models for nanoMIPS hosts -* preferred_cpu_models_MIPS:: Preferred CPU models for MIPS hosts -@end menu - -@node cpu_models_MIPS32 -@subsubsection Supported CPU models for MIPS32 hosts - -The following CPU models are supported for use on MIPS32 hosts. Administra= tors / -applications are recommended to use the CPU model that matches the generat= ion -of the host CPUs in use. In a deployment with a mixture of host CPU models -between machines, if live migration compatibility is required, use the new= est -CPU model that is compatible across all desired hosts. - -@table @option -@item @code{mips32r6-generic} - -MIPS32 Processor (Release 6, 2015) - - -@item @code{P5600} - -MIPS32 Processor (P5600, 2014) - - -@item @code{M14K} -@item @code{M14Kc} - -MIPS32 Processor (M14K, 2009) - - -@item @code{74Kf} - -MIPS32 Processor (74K, 2007) - - -@item @code{34Kf} - -MIPS32 Processor (34K, 2006) - - -@item @code{24Kc} -@item @code{24KEc} -@item @code{24Kf} - -MIPS32 Processor (24K, 2003) - - -@item @code{4Kc} -@item @code{4Km} -@item @code{4KEcR1} -@item @code{4KEmR1} -@item @code{4KEc} -@item @code{4KEm} - -MIPS32 Processor (4K, 1999) -@end table - -@node cpu_models_MIPS64 -@subsubsection Supported CPU models for MIPS64 hosts - -The following CPU models are supported for use on MIPS64 hosts. Administra= tors / -applications are recommended to use the CPU model that matches the generat= ion -of the host CPUs in use. In a deployment with a mixture of host CPU models -between machines, if live migration compatibility is required, use the new= est -CPU model that is compatible across all desired hosts. - -@table @option -@item @code{I6400} - -MIPS64 Processor (Release 6, 2014) - - -@item @code{Loongson-2F} - -MIPS64 Processor (Loongson 2, 2008) - - -@item @code{Loongson-2E} - -MIPS64 Processor (Loongson 2, 2006) - - -@item @code{mips64dspr2} - -MIPS64 Processor (Release 2, 2006) - - -@item @code{MIPS64R2-generic} -@item @code{5KEc} -@item @code{5KEf} - -MIPS64 Processor (Release 2, 2002) - - -@item @code{20Kc} - -MIPS64 Processor (20K, 2000) - - -@item @code{5Kc} -@item @code{5Kf} - -MIPS64 Processor (5K, 1999) - - -@item @code{VR5432} - -MIPS64 Processor (VR, 1998) - - -@item @code{R4000} - -MIPS64 Processor (MIPS III, 1991) -@end table - -@node cpu_models_nanoMIPS -@subsubsection Supported CPU models for nanoMIPS hosts - -The following CPU models are supported for use on nanoMIPS hosts. Administ= rators / -applications are recommended to use the CPU model that matches the generat= ion -of the host CPUs in use. In a deployment with a mixture of host CPU models -between machines, if live migration compatibility is required, use the new= est -CPU model that is compatible across all desired hosts. - -@table @option -@item @code{I7200} - -MIPS I7200 (nanoMIPS, 2018) - -@end table - -@node preferred_cpu_models_MIPS -@subsubsection Preferred CPU models for MIPS hosts - -The following CPU models are preferred for use on different MIPS hosts: - -@table @option -@item @code{MIPS III} -R4000 - -@item @code{MIPS32R2} -34Kf - -@item @code{MIPS64R6} -I6400 - -@item @code{nanoMIPS} -I7200 -@end table - @node cpu_model_syntax_apps @subsection Syntax for configuring CPU models =20 The example below illustrate the approach to configuring the various -CPU models / features in QEMU and libvirt +CPU models / features in QEMU and libvirt. =20 -@menu -* cpu_model_syntax_qemu:: QEMU command line -* cpu_model_syntax_libvirt:: Libvirt guest XML -@end menu - -@node cpu_model_syntax_qemu -@subsubsection QEMU command line +QEMU command line: =20 @table @option =20 @@ -603,8 +426,8 @@ With feature customization: =20 @end table =20 -@node cpu_model_syntax_libvirt -@subsubsection Libvirt guest XML + +Libvirt guest XML: =20 @table @option =20 @@ -657,21 +480,3 @@ With feature customization: @end example =20 @end table - -@c man end - -@ignore - -@setfilename qemu-cpu-models -@settitle QEMU / KVM CPU model configuration - -@c man begin SEEALSO -The HTML documentation of QEMU for more precise information and Linux -user mode emulator invocation. -@c man end - -@c man begin AUTHOR -Daniel P. Berrange -@c man end - -@end ignore diff --git a/docs/system/qemu-cpu-models.texi b/docs/system/qemu-cpu-models= .texi new file mode 100644 index 00000000000..f399daf9448 --- /dev/null +++ b/docs/system/qemu-cpu-models.texi @@ -0,0 +1,28 @@ +@c man begin SYNOPSIS +QEMU / KVM CPU model configuration +@c man end + +@set qemu_system_x86 qemu-system-x86_64 + +@c man begin DESCRIPTION + +@include cpu-models-x86.texi +@include cpu-models-mips.texi + +@c man end + +@ignore + +@setfilename qemu-cpu-models +@settitle QEMU / KVM CPU model configuration + +@c man begin SEEALSO +The HTML documentation of QEMU for more precise information and Linux +user mode emulator invocation. +@c man end + +@c man begin AUTHOR +Daniel P. Berrange +@c man end + +@end ignore diff --git a/qemu-doc.texi b/qemu-doc.texi index e555dea4ef6..617a701b678 100644 --- a/qemu-doc.texi +++ b/qemu-doc.texi @@ -139,7 +139,7 @@ accelerator is required to use more than one host CPU f= or emulation. * pcsys_keys:: Keys in the graphical frontends * mux_keys:: Keys in the character backend multiplexer * pcsys_monitor:: QEMU Monitor -* cpu_models:: CPU models +* cpu_models_x86:: Supported CPU model configurations on x86 hosts * disk_images:: Disk Images * pcsys_network:: Network emulation * pcsys_other_devs:: Other Devices @@ -614,10 +614,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{$}. =20 -@node cpu_models -@section CPU models - -@include docs/qemu-cpu-models.texi +@include docs/system/cpu-models-x86.texi =20 @node disk_images @section Disk Images @@ -1864,6 +1861,7 @@ Set the emulated machine type. The default is sun4u. @cindex system emulation (MIPS) =20 @menu +* recommendations_cpu_models_MIPS:: Supported CPU model configurations on = MIPS hosts * nanoMIPS System emulator :: @end menu =20 @@ -1980,6 +1978,10 @@ PC style serial port MIPSnet network emulation @end itemize =20 +@lowersections +@include docs/system/cpu-models-mips.texi +@raisesections + @node nanoMIPS System emulator @subsection nanoMIPS System emulator @cindex system emulation (nanoMIPS) --=20 2.20.1