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

dump CPUID .bochsrc options only if no CPUDB profile is selected

Browse Source
This commit is contained in:
Stanislav Shwartsman 2012-03-15 19:55:14 +00:00
parent 5a33b1be84
commit 733dc3bb3c
2 changed files with 46 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bochs/CHANGES
View File

@ -15,7 +15,9 @@ Changes after 2.5.1 release:
- Added debug dump for pci2isa and DMA controller devices
- Configure and compile
- moved networking, sound and USB devices to subdirectories in iodev
- Moved networking, sound and USB devices to subdirectories in iodev
- Moved MWAIT_IS_NOP .bochsrc option from CPUID to CPU so it can be set
even if cpu was configured using pre-defined CPUDB profile
- I/O Devices
- Networking

3
bochs/config.cc
View File

@ -3644,6 +3644,8 @@ int bx_write_configuration(const char *rc, int overwrite)
fprintf(fp, "\n");
#if BX_CPU_LEVEL >= 4
if (! SIM->get_param_enum(BXPN_CPU_MODEL)->get()) {
// dump only when using BX_GENERIC CPUDB profile
fprintf(fp, "cpuid: family=%d, model=0x%02x, stepping=%d",
SIM->get_param_num(BXPN_CPUID_FAMILY)->get(),
SIM->get_param_num(BXPN_CPUID_MODEL)->get(),
@ -3699,6 +3701,7 @@ int bx_write_configuration(const char *rc, int overwrite)
if (brand_string)
fprintf(fp, "cpuid: brand_string=\"%s\"\n", brand_string);
fprintf(fp, "\n");
}
#endif
fprintf(fp, "print_timestamps: enabled=%d\n", bx_dbg.print_timestamps);