From patchwork Fri Mar 6 11:09:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 184277 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp7306178ile; Fri, 6 Mar 2020 03:24:15 -0800 (PST) X-Google-Smtp-Source: ADFU+vtIon31OISeELq4KMxsyhXEttv9WWqCUnsw1TFchZdVPmw2GpkpgxrLS50+/yivQEO904lU X-Received: by 2002:a05:6214:1051:: with SMTP id l17mr2389560qvr.175.1583493854951; Fri, 06 Mar 2020 03:24:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583493854; cv=none; d=google.com; s=arc-20160816; b=Tc6g0vX/kL6YYfMGbUWGxfU+qv5viHm/vP/XxSP309Ug9IRF38fNW5DDS6uIXx4Db1 y68IoNRaAu1eTEjbPn77yOj+KILJfJnKOwT/NWm2kEfz2lZuJkPSfFevbO50TwD/t6U2 iRZaPUFQa4pvr8ej0regXPqZM9K62hsCh8uNwibgY5EumRSuTeAbgSHTLHHWYks5w/M+ TtOmLfvVTjbDXFyCceLEQqVMR4MP7Dg9v1Sk2WxiCBv0EwvV6w2T7I5LzMsoD49p1fzT lIHPsPvvMPIyC3Po2cu4r9kATuAV8ekgwmrpgT6GFrtzx6azCPEI/oqcvpDxCekwxESO d4+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=7OY23tRJocDW94ZLmht5pR972yq6jndMMrjO75L88As=; b=mXOkPu2WpFuU/BoNCcYXyjLOrc88xKRH7WI53c+/gNDk9Xl9L1SklyzvHenNmGbpbx f0XuLPgYaNTw2oVdAT10GWpXfNE8ix0EaO53f63UbWsfUUQkwca+AtlocsaAWGQF+EHy iO2mswgrRhm2TepqwQ0HClvthDrg8lxF9fFjFAxBGnx6d1UoTxSz3wcFCAjwvMLMklQi mFes4JOIxBJUq2K4scL4daaceYYzlq83rWL738rGdQ5pim9VLn8esPYqemleojuJ/Pz3 PLJGj8lurBehertK6xwM4/w5x4jDA6WsHa0o0dQJ6Sqs1TT/B8bqHifNxLrCvk0iYrX+ /F7Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gQ8Y114u; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m9si843068qtp.76.2020.03.06.03.24.14 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Mar 2020 03:24:14 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gQ8Y114u; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAB5S-0004vD-FG for patch@linaro.org; Fri, 06 Mar 2020 06:24:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39805) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jAAsN-0004AY-Gb for qemu-devel@nongnu.org; Fri, 06 Mar 2020 06:10:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jAAsI-0005hP-Vy for qemu-devel@nongnu.org; Fri, 06 Mar 2020 06:10:43 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:38920) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jAAsI-0005fB-Nr for qemu-devel@nongnu.org; Fri, 06 Mar 2020 06:10:38 -0500 Received: by mail-wm1-x342.google.com with SMTP id j1so1916484wmi.4 for ; Fri, 06 Mar 2020 03:10:38 -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=7OY23tRJocDW94ZLmht5pR972yq6jndMMrjO75L88As=; b=gQ8Y114uLF4RzDu4Uk/ag8JsTwhVKLuzDlvWteCsxCF2/14nMELXA0TxSA10+vSrN4 vyUTzmaNV10PzSQw2ldkad2d+iQPUQbGPeE5Udc7pBN8GQk1oKB0Na5YPvsf1ncrNz+4 l+bc6TYtboNiNCT9Jc0gBGdwCyPc9ntUIw7krqQdYgtMXvfyc7InVW6L5GYMem7FglM2 hFH9cUelOZQaRYqZ1MX8s5WXgStI7LnzbYfqgSgexTwaQwwyGvBUpu930hqw0gfFo2Kc C42xx1TVbyIpmjWZyDfIqFyfYrDdaHV5YiuG1ynB+kJeIJ5S4Nk0jxyX2THgXZoKEXrg YXvw== 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=7OY23tRJocDW94ZLmht5pR972yq6jndMMrjO75L88As=; b=i94mEw6Ag56B4RLP4hSl+0xNJZubqEEvObELQ7Forb0oZBvKRCEu3hnxDwebCcw92d 6eXTR/0twH3Y9KVlBCzGT5jubeaImC3WuGAhx0Duh3qJnsZp8FiYCUPW9tjmwWAiY10y Jm6OM2hN3j7q1WoIyjoQZx4q4/V9UNoFrXUSoCTuj6OehwXSg1IRr0+5Zv2djmnez6Gg /Bho5NZqNuBCmuCtxO0B3sxQzDtJXs13bdnET+joYWFUNx4wqkXkVcTCzziuT6t+BmKl ah4jpGmTUsyD/yOhnsgSeXIfIxTMe0VR4DpDcardqpwTmhNG/KwnzC0wqMQHfZd+MWXz jRVQ== X-Gm-Message-State: ANhLgQ19F5/A6zYpKiR4WEE3nLEDVS2YX+R2TIxFQ8egay5gV8Yzeqsu wprO43MUlM+mf5rt/Qy6izZyCbTfgyihng== X-Received: by 2002:a7b:c34d:: with SMTP id l13mr3382229wmj.19.1583493037139; Fri, 06 Mar 2020 03:10:37 -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.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2020 03:10:36 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 24/33] docs: Roll -prom-env and -g target-specific info into qemu-options.hx Date: Fri, 6 Mar 2020 11:09:50 +0000 Message-Id: <20200306110959.29461-25-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 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: Alex Bennée Tested-by: Alex Bennée Message-id: 20200228153619.9906-25-peter.maydell@linaro.org --- 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(-) -- 2.20.1 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. 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. -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?=false' \ - -prom-env 'boot-device=hd:2,\yaboot' \ - -prom-env 'boot-args=conf=hd: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. -@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?=false' \ - -prom-env 'boot-device=hd:2,\yaboot' \ - -prom-env 'boot-args=conf=hd:2,\yaboot.conf' -@end example - -@end table - -@c man end - - More information is available at @url{http://perso.magic.fr/l_indien/qemu-ppc/}. 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 OpenBSD, 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?=false' \ - -prom-env 'boot-device=sd(0,2,0):d' -prom-env 'boot-args=linux 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 older Solaris kernels don't work probably due to interface issues between OpenBIOS and Solaris. -@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 option -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?=false' \ - -prom-env 'boot-device=sd(0,2,0):d' -prom-env 'boot-args=linux single' -@end example - -@item -M [SS-4|SS-5|SS-10|SS-20|SS-600MP|LX|Voyager|SPARCClassic] [|SPARCbook] - -Set the emulated machine type. Default is SS-5. - -@end table - @c man end 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 - 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?=false' - -``-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.texi 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 -@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?=false' -@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 753bfce411d..44366909719 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 option +of 1152x900x8 for people who wish to use OBP. + ETEXI DEF("vnc", HAS_ARG, QEMU_OPTION_vnc , @@ -4107,6 +4114,18 @@ STEXI @item -prom-env @var{variable}=@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?=false' \ + -prom-env 'boot-device=sd(0,2,0):d' -prom-env 'boot-args=linux single' +@end example + +@example +qemu-system-ppc -prom-env 'auto-boot?=false' \ + -prom-env 'boot-device=hd:2,\yaboot' \ + -prom-env 'boot-args=conf=hd:2,\yaboot.conf' +@end example + ETEXI DEF("semihosting", 0, QEMU_OPTION_semihosting, "-semihosting semihosting mode\n",