mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update docs about moving of cpuid_limit_winnt option

Browse Source
This commit is contained in:
Stanislav Shwartsman 2011-08-02 20:01:56 +00:00
parent fb405ad39a
commit 9d1538f0c9
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bochs/config.cc
View File

@ -2721,6 +2721,8 @@ static int parse_line_formatted(const char *context, int num_params, char *param
} }
#endif #endif
#endif #endif
} else if (!strncmp(params[i], "cpuid_limit_winnt=", 18)) {
PARSE_ERR(("%s: cpuid_limit_winnt moved to CPU .bochsrc option.", context));
} else { } else {
PARSE_ERR(("%s: cpuid directive malformed.", context)); PARSE_ERR(("%s: cpuid directive malformed.", context));
} }

12
bochs/doc/docbook/user/user.dbk
View File

@ -2951,6 +2951,11 @@ Reset the CPU when triple fault occur (highly recommended) rather than PANIC.
Remember that if you are trying to continue after triple fault the simulation Remember that if you are trying to continue after triple fault the simulation
will be completely bogus ! will be completely bogus !
</para> </para>
<para><command>cpuid_limit_winnt</command></para>
<para>
Determine whether to limit maximum CPUID function to 2. This mode is required
to workaround WinNT installation and boot issues.
</para>
<para><command>msrs</command></para> <para><command>msrs</command></para>
<para> <para>
Define path to user CPU Model Specific Registers (MSRs) specification. Define path to user CPU Model Specific Registers (MSRs) specification.
@ -3006,7 +3011,7 @@ speed.</para></footnote>.
<para> <para>
Example: Example:
<screen> <screen>
cpuid: mmx=1, sep=1, sse=sse4_2, apic=xapic, aes=1, movbe=1, xsave=1, cpuid_limit_winnt=0 cpuid: mmx=1, sep=1, sse=sse4_2, apic=xapic, aes=1, movbe=1, xsave=1
</screen> </screen>
This defines features and functionality supported by Bochs emulated CPU: This defines features and functionality supported by Bochs emulated CPU:
</para> </para>
@ -3109,11 +3114,6 @@ twelve-character ASCII string.
Set the CPUID brand string returned by CPUID(0x80000002 .. 0x80000004]). This should be Set the CPUID brand string returned by CPUID(0x80000002 .. 0x80000004]). This should be
at most a forty-eight-character ASCII string. at most a forty-eight-character ASCII string.
</para> </para>
<para><command>cpuid_limit_winnt</command></para>
<para>
Determine whether to limit maximum CPUID function to 3. This mode is required
to workaround WinNT installation and boot issues.
</para>
</section> </section>
<section><title>romimage</title> <section><title>romimage</title>

12
bochs/doc/man/bochsrc.5
View File

@ -139,6 +139,11 @@ Reset the CPU when triple fault occur (highly recommended) rather than
PANIC. Remember that if you trying to continue after triple fault the PANIC. Remember that if you trying to continue after triple fault the
simulation will be completely bogus ! simulation will be completely bogus !
cpuid_limit_winnt:
Determine whether to limit maximum CPUID function to 2. This mode is
required to workaround WinNT installation and boot issues.
msrs: msrs:
Define path to user CPU Model Specific Registers (MSRs) specification. Define path to user CPU Model Specific Registers (MSRs) specification.
@ -286,13 +291,8 @@ brand_string:
Set the CPUID vendor string returned by CPUID(0x80000002 .. 0x80000004). Set the CPUID vendor string returned by CPUID(0x80000002 .. 0x80000004).
This should be at most a forty-eight-character ASCII string. This should be at most a forty-eight-character ASCII string.
cpuid_limit_winnt:
Determine whether to limit maximum CPUID function to 3. This mode is
required to workaround WinNT installation and boot issues.
Example: Example:
cpuid: mmx=1, sep=1, sse=sse4_2, xapic=1, aes=1, movbe=1, xsave=1, cpuid_limit_winnt=0 cpuid: mmx=1, sep=1, sse=sse4_2, xapic=1, aes=1, movbe=1, xsave=1
.TP .TP
.I "megs:" .I "megs:"