From nobody Thu Nov 13 22:12:09 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=1582904681; cv=none; d=zohomail.com; s=zohoarc; b=k5IMl9DTujHWkpSscn+vKsdyAC54TLQ6vorIrON6Tvsn+Nkmau42DmXQAWVEwx6XYMe+W7oJEyO/nnholM/yo+BaE7MRTEqBiIf52t8+zsicRNxKHzUp6rp97TxMniD8BFRESv5M1hfo1ybt6bgfjbVAnBkI6P1lnAHZ8NtRepU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582904681; h=Content-Transfer-Encoding:Cc: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=ow1LDJV1/Ida3kt2aML/vDnb6kPmSSMSoBYAW/XYLhk=; b=RBZWWgrxeX443dBSMtxnY/g7PiZrJ9o02DQFW86e2ZHThRn0uscbx1uOwTCBmUBl5yuyLhVnP+HZdF20NrHifnnXDEekQwrlrxnth+YJpqz2CTv5n8HVAeIMuGWzqwopDa5WB0SOTOZy0Wg9Ma+NmkT5bgifJldUaSLm+gEn3lg= 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 158290468105221.47743938737699; Fri, 28 Feb 2020 07:44:41 -0800 (PST) Received: from localhost ([::1]:48878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j7hod-0007ax-K7 for importer@patchew.org; Fri, 28 Feb 2020 10:44:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46960) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j7hhH-0001Nl-FI for qemu-devel@nongnu.org; Fri, 28 Feb 2020 10:37:05 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j7hhF-000558-K1 for qemu-devel@nongnu.org; Fri, 28 Feb 2020 10:37:03 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:42797) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j7hhF-00054Y-DI for qemu-devel@nongnu.org; Fri, 28 Feb 2020 10:37:01 -0500 Received: by mail-wr1-x443.google.com with SMTP id p18so3401705wre.9 for ; Fri, 28 Feb 2020 07:37:01 -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.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Feb 2020 07:36:59 -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=ow1LDJV1/Ida3kt2aML/vDnb6kPmSSMSoBYAW/XYLhk=; b=YOWE1T6WYcKlI8wwNebDzG0o/s319ScxVhH1B45CPA2smElhbANeba1k1JHLVJeuJd c94UrgprEH5G0ezQFCDM2o0ObjQdYbSHQxacxvIZcU8/B1polX5xPEYzxH1qwpMT+Lpg IY4SWhao45AFYMkpQyxfeJ1WqhX7rSFQRPhWWSFLENNctMQHIRWcTzEHUMivlEMsa7U1 X9/0I1DoLMHjgXNGuzGaxT6wbGaxuQ+gm7nKR5XRoX4hf5Rv+VLPE+o2/1PlBVlGfYZu Ae2RazVbCVBtWE8L9556Bz5Yh1gS5QtO1+oQgaDMKyWNWPMk4Zin3z75zPpjRn7T9KBS 8rdg== 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=ow1LDJV1/Ida3kt2aML/vDnb6kPmSSMSoBYAW/XYLhk=; b=uVxWuXh8u8iOlNOTRlhhFwYP90Vj5S1ksf3sgxGwQ56xtKqiDnZcEibRyptlU6Q5oo 4mZ5cwHdjM7vFI1sfUIUWhFN6QfkUsVrTM80QnR8Yw/Kyve0VEeWyrwYQtxKCAlAkBAg a8W2mEHkonzzwlh7OI/lBpJflietIaTqmw4BdSmshvyKAvT2JNzcVWBbanfwGR6d+D1a eDIl3jgBIyweb/7UMP5ne3yfo9v7GwKL4O+C7WcEerCggsBl1P6mpyMyPBNBhY5IpKgU gdrnRYWEVPah2RfMaQoBusVR8hfkwIyDCCRyNhzJHtCRMPn8rNaq72HktmjYQNyTlIz0 Deqw== X-Gm-Message-State: APjAAAWjvj+K7RkXHkHNH+rv10ER2XjfWkzlb8YEag6+i4NSTNjVPEQh F4pishTLM5DY8jDp20xt1y2vqtPX5BvygQ== X-Google-Smtp-Source: APXvYqzkJumH8L12BD+KgfXZ7WWngsJQAo508wuzln0vFmXyDiEcRdnoDkp1zVVQGdXoxFUFw+fRmw== X-Received: by 2002:a05:6000:192:: with SMTP id p18mr5263338wrx.218.1582904219818; Fri, 28 Feb 2020 07:36:59 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PATCH v3 24/33] docs: Roll -prom-env and -g target-specific info into qemu-options.hx Date: Fri, 28 Feb 2020 15:36:10 +0000 Message-Id: <20200228153619.9906-25-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: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Content-Type: text/plain; charset="utf-8" The SPARC and PPC targets currently have a fragment of target-specific information about the -g and -prom options which would be better placed as part of the general documentation of those options in qemu-options.hx. Move the relevant information to those locations. SPARC also has a bit of text about the -M option which is out of date and provides no useful information over the generic documentation of that option, so just delete it. The motivation here is again to avoid having to awkwardly include this text into the rST version of the qemu.1 manpage. Signed-off-by: Peter Maydell --- docs/system/target-ppc.rst | 14 -------------- docs/system/target-ppc.texi | 25 ------------------------- docs/system/target-sparc.rst | 19 ------------------- docs/system/target-sparc.texi | 27 --------------------------- docs/system/target-sparc64.rst | 12 ------------ docs/system/target-sparc64.texi | 22 ---------------------- qemu-options.hx | 19 +++++++++++++++++++ 7 files changed, 19 insertions(+), 119 deletions(-) diff --git a/docs/system/target-ppc.rst b/docs/system/target-ppc.rst index 43fadf3c00b..a2f04c533c2 100644 --- a/docs/system/target-ppc.rst +++ b/docs/system/target-ppc.rst @@ -43,19 +43,5 @@ the g3beige and mac99 PowerMac and the 40p machines. Ope= nBIOS is a free (GPL v2) portable firmware implementation. The goal is to implement a 100% IEEE 1275-1994 (referred to as Open Firmware) compliant firmware. =20 -The following options are specific to the PowerPC emulation: - -``-g WxH[xDEPTH]`` - Set the initial VGA graphic mode. The default is 800x600x32. - -``-prom-env string`` - Set OpenBIOS variables in NVRAM, for example: - - :: - - qemu-system-ppc -prom-env 'auto-boot?=3Dfalse' \ - -prom-env 'boot-device=3Dhd:2,\yaboot' \ - -prom-env 'boot-args=3Dconf=3Dhd:2,\yaboot.conf' - More information is available at http://perso.magic.fr/l_indien/qemu-ppc/. diff --git a/docs/system/target-ppc.texi b/docs/system/target-ppc.texi index 55f98f65b12..5c83d4f68e7 100644 --- a/docs/system/target-ppc.texi +++ b/docs/system/target-ppc.texi @@ -47,31 +47,6 @@ for the g3beige and mac99 PowerMac and the 40p machines.= OpenBIOS is a free (GPL v2) portable firmware implementation. The goal is to implement a 100% IEEE 1275-1994 (referred to as Open Firmware) compliant firmware. =20 -@c man begin OPTIONS - -The following options are specific to the PowerPC emulation: - -@table @option - -@item -g @var{W}x@var{H}[x@var{DEPTH}] - -Set the initial VGA graphic mode. The default is 800x600x32. - -@item -prom-env @var{string} - -Set OpenBIOS variables in NVRAM, for example: - -@example -qemu-system-ppc -prom-env 'auto-boot?=3Dfalse' \ - -prom-env 'boot-device=3Dhd:2,\yaboot' \ - -prom-env 'boot-args=3Dconf=3Dhd:2,\yaboot.conf' -@end example - -@end table - -@c man end - - More information is available at @url{http://perso.magic.fr/l_indien/qemu-ppc/}. =20 diff --git a/docs/system/target-sparc.rst b/docs/system/target-sparc.rst index 589c88d1756..b55f8d09e9c 100644 --- a/docs/system/target-sparc.rst +++ b/docs/system/target-sparc.rst @@ -60,22 +60,3 @@ QEMU web site. There are still issues with NetBSD and Op= enBSD, but most kernel versions work. Please note that currently older Solaris kernels don't work probably due to interface issues between OpenBIOS and Solaris. - -The following options are specific to the Sparc32 emulation: - -``-g WxHx[xDEPTH]`` - Set the initial graphics mode. For TCX, the default is 1024x768x8 - with the option of 1024x768x24. For cgthree, the default is - 1024x768x8 with the option of 1152x900x8 for people who wish to use - OBP. - -``-prom-env string`` - Set OpenBIOS variables in NVRAM, for example: - - :: - - qemu-system-sparc -prom-env 'auto-boot?=3Dfalse' \ - -prom-env 'boot-device=3Dsd(0,2,0):d' -prom-env 'boot-args=3Dlinux = single' - -``-M [SS-4|SS-5|SS-10|SS-20|SS-600MP|LX|Voyager|SPARCClassic] [|SPARCbook]= `` - Set the emulated machine type. Default is SS-5. diff --git a/docs/system/target-sparc.texi b/docs/system/target-sparc.texi index 7748001f734..99fbf820b42 100644 --- a/docs/system/target-sparc.texi +++ b/docs/system/target-sparc.texi @@ -64,32 +64,5 @@ most kernel versions work. Please note that currently ol= der Solaris kernels don't work probably due to interface issues between OpenBIOS and Solaris. =20 -@c man begin OPTIONS - -The following options are specific to the Sparc32 emulation: - -@table @option - -@item -g @var{W}x@var{H}x[x@var{DEPTH}] - -Set the initial graphics mode. For TCX, the default is 1024x768x8 with the -option of 1024x768x24. For cgthree, the default is 1024x768x8 with the opt= ion -of 1152x900x8 for people who wish to use OBP. - -@item -prom-env @var{string} - -Set OpenBIOS variables in NVRAM, for example: - -@example -qemu-system-sparc -prom-env 'auto-boot?=3Dfalse' \ - -prom-env 'boot-device=3Dsd(0,2,0):d' -prom-env 'boot-args=3Dlinux single' -@end example - -@item -M [SS-4|SS-5|SS-10|SS-20|SS-600MP|LX|Voyager|SPARCClassic] [|SPARCb= ook] - -Set the emulated machine type. Default is SS-5. - -@end table - @c man end =20 diff --git a/docs/system/target-sparc64.rst b/docs/system/target-sparc64.rst index ca76ba9c488..97e334b9308 100644 --- a/docs/system/target-sparc64.rst +++ b/docs/system/target-sparc64.rst @@ -35,15 +35,3 @@ QEMU emulates the following peripherals: - 2 PCI IDE interfaces with hard disk and CD-ROM support =20 - Floppy disk - -The following options are specific to the Sparc64 emulation: - -``-prom-env string`` - Set OpenBIOS variables in NVRAM, for example: - - :: - - qemu-system-sparc64 -prom-env 'auto-boot?=3Dfalse' - -``-M [sun4u|sun4v|niagara]`` - Set the emulated machine type. The default is sun4u. diff --git a/docs/system/target-sparc64.texi b/docs/system/target-sparc64.t= exi index 4db4ca3842b..d381d3af719 100644 --- a/docs/system/target-sparc64.texi +++ b/docs/system/target-sparc64.texi @@ -36,25 +36,3 @@ PC-compatible serial ports Floppy disk @end itemize =20 -@c man begin OPTIONS - -The following options are specific to the Sparc64 emulation: - -@table @option - -@item -prom-env @var{string} - -Set OpenBIOS variables in NVRAM, for example: - -@example -qemu-system-sparc64 -prom-env 'auto-boot?=3Dfalse' -@end example - -@item -M [sun4u|sun4v|niagara] - -Set the emulated machine type. The default is sun4u. - -@end table - -@c man end - diff --git a/qemu-options.hx b/qemu-options.hx index 4bc8048f60b..3b230a17164 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -1962,6 +1962,13 @@ STEXI @item -g @var{width}x@var{height}[x@var{depth}] @findex -g Set the initial graphical resolution and depth (PPC, SPARC only). + +For PPC the default is 800x600x32. + +For SPARC with the TCX graphics device, the default is 1024x768x8 with the +option of 1024x768x24. For cgthree, the default is 1024x768x8 with the opt= ion +of 1152x900x8 for people who wish to use OBP. + ETEXI =20 DEF("vnc", HAS_ARG, QEMU_OPTION_vnc , @@ -4107,6 +4114,18 @@ STEXI @item -prom-env @var{variable}=3D@var{value} @findex -prom-env Set OpenBIOS nvram @var{variable} to given @var{value} (PPC, SPARC only). + +@example +qemu-system-sparc -prom-env 'auto-boot?=3Dfalse' \ + -prom-env 'boot-device=3Dsd(0,2,0):d' -prom-env 'boot-args=3Dlinux single' +@end example + +@example +qemu-system-ppc -prom-env 'auto-boot?=3Dfalse' \ + -prom-env 'boot-device=3Dhd:2,\yaboot' \ + -prom-env 'boot-args=3Dconf=3Dhd:2,\yaboot.conf' +@end example + ETEXI DEF("semihosting", 0, QEMU_OPTION_semihosting, "-semihosting semihosting mode\n", --=20 2.20.1