Skip to content

Commit

Permalink
updates to user docs
Browse files Browse the repository at this point in the history
  • Loading branch information
Stanislav Shwartsman committed Nov 17, 2024
1 parent b370a14 commit 21ac8b8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 10 deletions.
1 change: 1 addition & 0 deletions bochs/.bochsrc
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@
#
# CPU configurations that can be selected:
# -----------------------------------------------------------------
# i386 Intel 386SX
# i486dx4 Intel 486DX4
# pentium Intel Pentium (P54C)
# pentium_mmx Intel Pentium MMX
Expand Down
12 changes: 5 additions & 7 deletions bochs/doc/docbook/user/user.dbk
Original file line number Diff line number Diff line change
Expand Up @@ -3407,9 +3407,7 @@ This defines the parameters of the cpu inside Bochs:
<para><command>model</command></para>
<para>
Selects CPU configuration to emulate from pre-defined list of all
supported configurations. When this option is used and the value
is different from 'bx_generic', the parameters of the <link linkend="bochsopt-cpuid">CPUID</link>
option have no effect anymore. See the <xref linkend="cpu-models"> for supported values.
supported configurations. See the <xref linkend="cpu-models"> for supported values.
</para>
<para><command>add_features</command></para>
<para>
Expand Down Expand Up @@ -5791,9 +5789,9 @@ features enabled at compile time (3rd column).
</thead>
<tbody>
<row>
<entry>bx_generic</entry>
<entry>Default Bochs CPU configured with <link linkend="bochsopt-cpuid">CPUID</link> option</entry>
<entry>cpu level 4</entry>
<entry>i386</entry>
<entry>Intel 386SX</entry>
<entry>cpu level 3</entry>
</row>
<row>
<entry>i486dx4</entry>
Expand Down Expand Up @@ -11485,7 +11483,7 @@ floppy_bootsig_check: disabled=0
vga: update_freq=5
keyboard_serial_delay: 250
keyboard_paste_delay: 100000
cpu: ips=3000000
cpu: model=pentium_mmx, ips=3000000
clock: sync=realtime, time0=0
mouse: enabled=0
private_colormap: enabled=0
Expand Down
4 changes: 1 addition & 3 deletions bochs/doc/man/bochsrc.5
Original file line number Diff line number Diff line change
Expand Up @@ -132,9 +132,7 @@ This defines cpu-related parameters inside Bochs:
model:

Selects CPU configuration to emulate from pre-defined list of all
supported configurations. When this option is used and the value
is different from 'bx_generic', the parameters of the CPUID option
have no effect anymore. See the bochsrc sample for supported values.
supported configurations. See the bochsrc sample for supported values.

add_features:

Expand Down

0 comments on commit 21ac8b8

Please sign in to comment.