qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio

docs: Roll -prom-env and -g target-specific info into qemu-options.hx

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 <peter.maydell@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 20200228153619.9906-25-peter.maydell@linaro.org

+19 -119
-14
docs/system/target-ppc.rst
··· 43 43 (GPL v2) portable firmware implementation. The goal is to implement a 44 44 100% IEEE 1275-1994 (referred to as Open Firmware) compliant firmware. 45 45 46 - The following options are specific to the PowerPC emulation: 47 - 48 - ``-g WxH[xDEPTH]`` 49 - Set the initial VGA graphic mode. The default is 800x600x32. 50 - 51 - ``-prom-env string`` 52 - Set OpenBIOS variables in NVRAM, for example: 53 - 54 - :: 55 - 56 - qemu-system-ppc -prom-env 'auto-boot?=false' \ 57 - -prom-env 'boot-device=hd:2,\yaboot' \ 58 - -prom-env 'boot-args=conf=hd:2,\yaboot.conf' 59 - 60 46 More information is available at 61 47 http://perso.magic.fr/l_indien/qemu-ppc/.
-25
docs/system/target-ppc.texi
··· 47 47 (GPL v2) portable firmware implementation. The goal is to implement a 100% 48 48 IEEE 1275-1994 (referred to as Open Firmware) compliant firmware. 49 49 50 - @c man begin OPTIONS 51 - 52 - The following options are specific to the PowerPC emulation: 53 - 54 - @table @option 55 - 56 - @item -g @var{W}x@var{H}[x@var{DEPTH}] 57 - 58 - Set the initial VGA graphic mode. The default is 800x600x32. 59 - 60 - @item -prom-env @var{string} 61 - 62 - Set OpenBIOS variables in NVRAM, for example: 63 - 64 - @example 65 - qemu-system-ppc -prom-env 'auto-boot?=false' \ 66 - -prom-env 'boot-device=hd:2,\yaboot' \ 67 - -prom-env 'boot-args=conf=hd:2,\yaboot.conf' 68 - @end example 69 - 70 - @end table 71 - 72 - @c man end 73 - 74 - 75 50 More information is available at 76 51 @url{http://perso.magic.fr/l_indien/qemu-ppc/}. 77 52
-19
docs/system/target-sparc.rst
··· 60 60 kernel versions work. Please note that currently older Solaris kernels 61 61 don't work probably due to interface issues between OpenBIOS and 62 62 Solaris. 63 - 64 - The following options are specific to the Sparc32 emulation: 65 - 66 - ``-g WxHx[xDEPTH]`` 67 - Set the initial graphics mode. For TCX, the default is 1024x768x8 68 - with the option of 1024x768x24. For cgthree, the default is 69 - 1024x768x8 with the option of 1152x900x8 for people who wish to use 70 - OBP. 71 - 72 - ``-prom-env string`` 73 - Set OpenBIOS variables in NVRAM, for example: 74 - 75 - :: 76 - 77 - qemu-system-sparc -prom-env 'auto-boot?=false' \ 78 - -prom-env 'boot-device=sd(0,2,0):d' -prom-env 'boot-args=linux single' 79 - 80 - ``-M [SS-4|SS-5|SS-10|SS-20|SS-600MP|LX|Voyager|SPARCClassic] [|SPARCbook]`` 81 - Set the emulated machine type. Default is SS-5.
-27
docs/system/target-sparc.texi
··· 64 64 don't work probably due to interface issues between OpenBIOS and 65 65 Solaris. 66 66 67 - @c man begin OPTIONS 68 - 69 - The following options are specific to the Sparc32 emulation: 70 - 71 - @table @option 72 - 73 - @item -g @var{W}x@var{H}x[x@var{DEPTH}] 74 - 75 - Set the initial graphics mode. For TCX, the default is 1024x768x8 with the 76 - option of 1024x768x24. For cgthree, the default is 1024x768x8 with the option 77 - of 1152x900x8 for people who wish to use OBP. 78 - 79 - @item -prom-env @var{string} 80 - 81 - Set OpenBIOS variables in NVRAM, for example: 82 - 83 - @example 84 - qemu-system-sparc -prom-env 'auto-boot?=false' \ 85 - -prom-env 'boot-device=sd(0,2,0):d' -prom-env 'boot-args=linux single' 86 - @end example 87 - 88 - @item -M [SS-4|SS-5|SS-10|SS-20|SS-600MP|LX|Voyager|SPARCClassic] [|SPARCbook] 89 - 90 - Set the emulated machine type. Default is SS-5. 91 - 92 - @end table 93 - 94 67 @c man end 95 68
-12
docs/system/target-sparc64.rst
··· 35 35 - 2 PCI IDE interfaces with hard disk and CD-ROM support 36 36 37 37 - Floppy disk 38 - 39 - The following options are specific to the Sparc64 emulation: 40 - 41 - ``-prom-env string`` 42 - Set OpenBIOS variables in NVRAM, for example: 43 - 44 - :: 45 - 46 - qemu-system-sparc64 -prom-env 'auto-boot?=false' 47 - 48 - ``-M [sun4u|sun4v|niagara]`` 49 - Set the emulated machine type. The default is sun4u.
-22
docs/system/target-sparc64.texi
··· 36 36 Floppy disk 37 37 @end itemize 38 38 39 - @c man begin OPTIONS 40 - 41 - The following options are specific to the Sparc64 emulation: 42 - 43 - @table @option 44 - 45 - @item -prom-env @var{string} 46 - 47 - Set OpenBIOS variables in NVRAM, for example: 48 - 49 - @example 50 - qemu-system-sparc64 -prom-env 'auto-boot?=false' 51 - @end example 52 - 53 - @item -M [sun4u|sun4v|niagara] 54 - 55 - Set the emulated machine type. The default is sun4u. 56 - 57 - @end table 58 - 59 - @c man end 60 -
+19
qemu-options.hx
··· 1962 1962 @item -g @var{width}x@var{height}[x@var{depth}] 1963 1963 @findex -g 1964 1964 Set the initial graphical resolution and depth (PPC, SPARC only). 1965 + 1966 + For PPC the default is 800x600x32. 1967 + 1968 + For SPARC with the TCX graphics device, the default is 1024x768x8 with the 1969 + option of 1024x768x24. For cgthree, the default is 1024x768x8 with the option 1970 + of 1152x900x8 for people who wish to use OBP. 1971 + 1965 1972 ETEXI 1966 1973 1967 1974 DEF("vnc", HAS_ARG, QEMU_OPTION_vnc , ··· 4107 4114 @item -prom-env @var{variable}=@var{value} 4108 4115 @findex -prom-env 4109 4116 Set OpenBIOS nvram @var{variable} to given @var{value} (PPC, SPARC only). 4117 + 4118 + @example 4119 + qemu-system-sparc -prom-env 'auto-boot?=false' \ 4120 + -prom-env 'boot-device=sd(0,2,0):d' -prom-env 'boot-args=linux single' 4121 + @end example 4122 + 4123 + @example 4124 + qemu-system-ppc -prom-env 'auto-boot?=false' \ 4125 + -prom-env 'boot-device=hd:2,\yaboot' \ 4126 + -prom-env 'boot-args=conf=hd:2,\yaboot.conf' 4127 + @end example 4128 + 4110 4129 ETEXI 4111 4130 DEF("semihosting", 0, QEMU_OPTION_semihosting, 4112 4131 "-semihosting semihosting mode\n",