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

- documentation updates (vmware4 format, command line arguments)

Browse Source
This commit is contained in:
Volker Ruppert 2012-07-29 08:19:15 +00:00
parent 6daac95de0
commit 9cda22223c
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bochs/.bochsrc
View File

@ -455,7 +455,7 @@ ata3: enabled=0, ioaddr1=0x168, ioaddr2=0x360, irq=9
# This defines the type and characteristics of all attached ata devices:
# type= type of attached device [disk|cdrom]
# mode= only valid for disks [flat|concat|external|dll|sparse|vmware3]
# mode= only valid for disks [undoable|growing|volatile|vvfat]
# [vmware4|undoable|growing|volatile|vvfat]
# path= path of the image / directory
# cylinders= only valid for disks
# heads= only valid for disks

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

@ -3449,7 +3449,7 @@ sparse : stackable, commitable, rollbackable
vmware3 : vmware version 3 disk support
</para></listitem>
<listitem><para>
vmware4 : vmware version 4 disk support
vmware4 : vmware version 4 disk support (aka VMDK)
</para></listitem>
<listitem><para>
undoable : flat file with commitable redolog
@ -7720,7 +7720,7 @@ If unspecified, the default "mode" is flat.
</row>
<row> <entry> vmware4 </entry> <entry> vmware4 disk support </entry>
<entry>
vmware version 4 compatibility
vmware version 4 (VMDK) compatibility
</entry>
</row>
<row> <entry> undoable </entry> <entry> flat file with a commitable redolog </entry>

14
bochs/doc/man/bochs.1
View File

@ -1,5 +1,5 @@
.\"Document Author: Timothy R. Butler - tbutler@uninetsolutions.com"
.TH bochs 1 "29 Dec 2005" "bochs @version@" "The Bochs Project"
.TH bochs 1 "29 Jul 2012" "bochs @version@" "The Bochs Project"
.\"SKIP_SECTION"
.SH NAME
bochs \- Portable x86 Emulator.
@ -39,8 +39,20 @@ With this option bochs doesn't load a configuration file.
In that case the setup for the emulation must be done with
bochsrc options on the command line or in the start menu.
.TP
.BI \-r\ path
Restore the Bochs state from path
.TP
.BI \-log\ filename
Specify Bochs log file name
.TP
.BI \-h,\ --help
Print a summary of the command line options for bochs and exit.
.TP
.BI \-h,\ --help\ features
Display available features / devices and exit
.TP
.BI \-h,\ --help\ cpu
Display supported CPU models and exit
.LP
You can override the settings from the configuration file
with command line arguments, using the same syntax as the

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

@ -1,5 +1,5 @@
.\"Document Author: Timothy R. Butler - tbutler@uninetsolutions.com"
.TH bochsrc 5 "15 Jul 2012" "bochsrc" "The Bochs Project"
.TH bochsrc 5 "29 Jul 2012" "bochsrc" "The Bochs Project"
.\"SKIP_SECTION"
.SH NAME
bochsrc \- Configuration file for Bochs.
@ -485,7 +485,7 @@ Examples:
This defines the type and characteristics of all attached ata devices:
type= type of attached device [disk|cdrom]
path= path of the image
mode= image mode [flat|concat|external|dll|sparse|vmware3|undoable|growing|volatile], only valid for disks
mode= image mode [flat|concat|external|dll|sparse|vmware3|vmware4|undoable|growing|volatile], only valid for disks
cylinders= only valid for disks
heads= only valid for disks
spt= only valid for disks
@ -517,6 +517,7 @@ The mode option defines how the disk image is handled. Disks can be defined as:
- dll : developer's specific, through a DLL
- sparse : stackable, commitable, rollbackable
- vmware3 : vmware3 disk support
- vmware4 : vmware4 disk support (aka VMDK)
- undoable : flat file with commitable redolog
- growing : growing file
- volatile : flat file with volatile redolog