diff options
Diffstat (limited to 'contrib/bochs')
| -rw-r--r-- | contrib/bochs/.gitignore | 7 | ||||
| -rw-r--r-- | contrib/bochs/Makefile | 10 | ||||
| -rw-r--r-- | contrib/bochs/README | 95 | ||||
| -rw-r--r-- | contrib/bochs/README.qemu | 79 | ||||
| -rw-r--r-- | contrib/bochs/README.windows-ris | 31 | ||||
| -rw-r--r-- | contrib/bochs/bochs-writable-ROM-patch | 20 | ||||
| -rw-r--r-- | contrib/bochs/bochsrc.txt | 750 | ||||
| -rw-r--r-- | contrib/bochs/qemu-patch | 26 | ||||
| -rwxr-xr-x | contrib/bochs/serial-console | 278 | ||||
| -rw-r--r-- | contrib/bochs/serial-console.1 | 191 | ||||
| -rw-r--r-- | contrib/bochs/tunctl.c | 113 |
11 files changed, 0 insertions, 1600 deletions
diff --git a/contrib/bochs/.gitignore b/contrib/bochs/.gitignore deleted file mode 100644 index 4e8f81ab..00000000 --- a/contrib/bochs/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -bochsout.txt -parport.out -ne2k-tx.log -ne2k-txdump.txt -tunctl -bochs -qemu diff --git a/contrib/bochs/Makefile b/contrib/bochs/Makefile deleted file mode 100644 index 4a5b14ce..00000000 --- a/contrib/bochs/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -all : tunctl serial-console.1 - -%.1 : % - pod2man $< > $@ - -tunctl : tunctl.c - $(CC) -o $@ $< - -clean : - rm -f serial-console.1 tunctl diff --git a/contrib/bochs/README b/contrib/bochs/README deleted file mode 100644 index e0e88032..00000000 --- a/contrib/bochs/README +++ /dev/null @@ -1,95 +0,0 @@ -Running Etherboot within Bochs -============================== - -Michael Brown <mbrown@fensystems.co.uk> -Based on an idea suggested by H. Peter Anvin <hpa@zytor.com>. - -$Id$ - -Bochs is a program that simulates a complete Intel x86 computer, -including hardware. It can be used to test Etherboot. There is a -special pseudo NIC ("pnic") implemented in Bochs, with a corresponding -driver in Etherboot. (There is also an NE2000 ISA driver in Bochs, -but it doesn't seem to quite work.) - -To get bochs running is fairly simple: - -1. Build the utilities in this directory: - make - -2. Get the bochs source code: - cvs -d:pserver:anonymous@bochs.cvs.sourceforge.net:/cvsroot/bochs \ - login - cvs -d:pserver:anonymous@bochs.cvs.sourceforge.net:/cvsroot/bochs \ - co bochs - -3. Configure bochs with - pushd bochs - ./configure --enable-all-optimisations --enable-show-ips \ - --enable-cpu-level=6 \ - --enable-pci --enable-pnic --enable-ne2000 \ - --enable-debugger --enable-disasm - popd - -4. Build bochs: - make -C bochs - -5. As root, set up a TAP virtual network device: - /sbin/modprobe tun - chmod o+rw /dev/net/tun - ./tunctl -u <username> -t tap0 - /sbin/ifconfig tap0 up 10.254.254.2 netmask 255.255.255.0 - -6. As root, add the following fragment to /etc/dhcpd.conf: - subnet 10.254.254.0 netmask 255.255.255.252 { - range dynamic-bootp 10.254.254.1 10.254.254.1; - } - You will also need to add in any of your usual declarations for - Etherboot, e.g. 'filename "vmlinuz.ltsp";'. Note that this setup - assumes that your DHCP server, TFTP server etc. all live on the - machine you are using for running Bochs. If not, then you're on - your own. - -7. As root, restart dhcpd - /etc/init.d/dhcpd restart - -8. Build Etherboot images - pushd ../../src - make bin/pnic.dsk - popd - -9. Start Bochs - ./bochs/bochs -q - You should get to the debugger prompt "<bochs:1>". Type "c" to - start running Bochs. - -You should see Bochs start up, load up Etherboot and attempt to boot -from the network. - - - -Serial console -============== - -You can use the program "serial-console" to obtain a virtual serial -console for Etherboot running within Bochs. Simply run -"./serial-console" on a spare tty (e.g. a separate xterm window) -before starting Bochs, and ensure that you have enabled CONSOLE_SERIAL -in config.h. - -There is a manual page for "serial-console"; use -"man ./serial-console.1" to view it. - - - -TODO -==== - -Packet forwarding/masquerading - document what must be set up. - -Mention possibility of using RFB as the display device - in -conjunction with the serial console, gives you a test facility that -can be accessed remotely. - -Mention use of BOCHSBP instruction (xchgw %bx,%bx) to avoid need to -calculate breakpoints. diff --git a/contrib/bochs/README.qemu b/contrib/bochs/README.qemu deleted file mode 100644 index 0c388973..00000000 --- a/contrib/bochs/README.qemu +++ /dev/null @@ -1,79 +0,0 @@ -Running gPXE within qemu -======================== - -Michael Brown <mbrown@fensystems.co.uk> - -To get qemu running is fairly simple: - -1. Build the utilities in this directory: - make - -2. Get the qemu source code: - svn co svn://svn.savannah.nongnu.org/qemu/trunk qemu - -2a. Patch the qemu code. There is currently a bug that causes qemu to - execute gPXE incredibly slowly. The bug seems to be related - to the relative prioritisation of CPU and I/O operations within - qemu. This patch (which I found via Google) isn't a proper fix, - but it does work around the problem: - patch -p0 < qemu-patch - -3. Configure qemu with - pushd qemu - ./configure --target-list=i386-softmmu,x86_64-softmmu - popd - -4. Build qemu: - make -C qemu - -5. As root, set up a TAP virtual network device: - /sbin/modprobe tun - chmod o+rw /dev/net/tun - ./tunctl -u <username> -t tap0 - /sbin/ifconfig tap0 up 10.254.254.2 netmask 255.255.255.0 - -6. As root, add the following fragment to /etc/dhcpd.conf: - subnet 10.254.254.0 netmask 255.255.255.252 { - range dynamic-bootp 10.254.254.1 10.254.254.1; - } - You will also need to add in any of your usual declarations for - gPXE, e.g. 'filename "vmlinuz.ltsp";'. Note that this setup - assumes that your DHCP server, TFTP server etc. all live on the - machine you are using for running qemu. If not, then you're on - your own. - -7. As root, restart dhcpd - /etc/init.d/dhcpd restart - -8. Build gPXE floppy disk images and pad to 1.44MB - pushd ../../src - make bin/rtl8139.dsk - popd - -9. Start qemu - ./qemu/i386-softmmu/qemu -L qemu/pc-bios \ - -net nic,model=rtl8139 -net tap,ifname=tap0 \ - -boot a -fda ../../src/bin/rtl8139.dsk - -You should see qemu start up, load up gPXE and attempt to boot from -the network. - - - -Serial console -============== - -You can use the program "serial-console" to obtain a virtual serial -console for gPXE running within qemu. Run "./serial-console" on a -spare tty (e.g. a separate xterm window) before starting qemu, and -ensure that you have enabled CONSOLE_SERIAL in config.h. - -When serial-console starts, it will print out the message "Slave pty -is /dev/pts/XX", where XX is a number. You need to append the option - - -serial /dev/pts/XX - -to the qemu command line. - -There is a manual page for "serial-console"; use "man -./serial-console.1" to view it. diff --git a/contrib/bochs/README.windows-ris b/contrib/bochs/README.windows-ris deleted file mode 100644 index 830db6a8..00000000 --- a/contrib/bochs/README.windows-ris +++ /dev/null @@ -1,31 +0,0 @@ -Debugging Windows Remote Installation Services (RIS) can be -problematic. Here are some assorted notes on the process: - - -Getting hold of the files -========================= - -Add/Remove Windows Components -> Remote Installation Services - -Files will be placed in \windows\system32\reminst. Copy them out to a -TFTP server. Configure DHCP to hand out startrom.com. - - -Getting past the "Press F12" message -==================================== - -Passing F12 through to the guest machine is difficult. It's easier to -patch the startrom.com binary to accept a different key. Open -startrom.com in a hex editor, search for the hex string -6681fb00860000, and replace it with 6681fb66210000. startrom.com will -now accept the "F" key instead of "F12". - - - -DHCP filename -============= - -Must use Windows backslash separator e.g. 'filename -"OSChooser\\i386\\startrom.com";', otherwise startrom.com fails to -correctly identify the path to NTLDR. - diff --git a/contrib/bochs/bochs-writable-ROM-patch b/contrib/bochs/bochs-writable-ROM-patch deleted file mode 100644 index 1ab9a27a..00000000 --- a/contrib/bochs/bochs-writable-ROM-patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: memory/memory.cc -=================================================================== -RCS file: /cvsroot/bochs/bochs/memory/memory.cc,v -retrieving revision 1.71 -diff -u -r1.71 memory.cc ---- memory/memory.cc 18 Oct 2008 18:10:14 -0000 1.71 -+++ memory/memory.cc 21 Oct 2008 19:47:07 -0000 -@@ -172,7 +172,11 @@ - break; - - case 0x0: // Writes to ROM, Inhibit -- BX_DEBUG(("Write to ROM ignored: address 0x" FMT_PHY_ADDRX ", data %02x", a20addr, *data_ptr)); -+ if ((a20addr & 0xfffe0000) == 0x000e0000) { -+ BX_DEBUG(("Write to ROM ignored: address 0x" FMT_PHY_ADDRX ", data %02x", a20addr, *data_ptr)); -+ } else { -+ BX_MEM_THIS rom[(a20addr & EXROM_MASK) + BIOSROMSZ] = *data_ptr; -+ } - break; - - default: diff --git a/contrib/bochs/bochsrc.txt b/contrib/bochs/bochsrc.txt deleted file mode 100644 index bf99f4cd..00000000 --- a/contrib/bochs/bochsrc.txt +++ /dev/null @@ -1,750 +0,0 @@ -# You may now use double quotes around pathnames, in case -# your pathname includes spaces. - -#======================================================================= -# CONFIG_INTERFACE -# -# The configuration interface is a series of menus or dialog boxes that -# allows you to change all the settings that control Bochs's behavior. -# There are two choices of configuration interface: a text mode version -# called "textconfig" and a graphical version called "wx". The text -# mode version uses stdin/stdout and is always compiled in. The graphical -# version is only available when you use "--with-wx" on the configure -# command. If you do not write a config_interface line, Bochs will -# choose a default for you. -# -# NOTE: if you use the "wx" configuration interface, you must also use -# the "wx" display library. -#======================================================================= -#config_interface: textconfig -#config_interface: wx - -#======================================================================= -# DISPLAY_LIBRARY -# -# The display library is the code that displays the Bochs VGA screen. Bochs -# has a selection of about 10 different display library implementations for -# different platforms. If you run configure with multiple --with-* options, -# the display_library command lets you choose which one you want to run with. -# If you do not write a display_library line, Bochs will choose a default for -# you. -# -# The choices are: -# x use X windows interface, cross platform -# win32 use native win32 libraries -# carbon use Carbon library (for MacOS X) -# beos use native BeOS libraries -# macintosh use MacOS pre-10 -# amigaos use native AmigaOS libraries -# sdl use SDL library, cross platform -# svga use SVGALIB library for Linux, allows graphics without X11 -# term text only, uses curses/ncurses library, cross platform -# rfb provides an interface to AT&T's VNC viewer, cross platform -# wx use wxWidgets library, cross platform -# nogui no display at all -# -# NOTE: if you use the "wx" configuration interface, you must also use -# the "wx" display library. -# -# Specific options: -# Some display libraries now support specific option to control their -# behaviour. See the examples below for currently supported options. -#======================================================================= -#display_library: amigaos -#display_library: beos -#display_library: carbon -#display_library: macintosh -#display_library: nogui -#display_library: rfb, options="timeout=60" # time to wait for client -#display_library: sdl, options="fullscreen" # startup in fullscreen mode -#display_library: term -#display_library: win32, options="legacyF12" # use F12 to toggle mouse -#display_library: wx -#display_library: x - -#======================================================================= -# ROMIMAGE: -# The ROM BIOS controls what the PC does when it first powers on. -# Normally, you can use a precompiled BIOS in the source or binary -# distribution called BIOS-bochs-latest. The ROM BIOS is usually loaded -# starting at address 0xf0000, and it is exactly 64k long. -# You can also use the environment variable $BXSHARE to specify the -# location of the BIOS. -# The usage of external large BIOS images (up to 512k) at memory top is -# now supported, but we still recommend to use the BIOS distributed with -# Bochs. Now the start address can be calculated from image size. -#======================================================================= -romimage: file=bochs/bios/BIOS-bochs-latest, address=0xe0000 -#romimage: file=mybios.bin, address=0xfff80000 # 512k at memory top -#romimage: file=mybios.bin # calculate start address from image size - -#======================================================================= -# CPU: -# This defines cpu-related parameters inside Bochs: -# -# COUNT: -# Set the number of processors:cores per processor:threads per core -# when Bochs is compiled for SMP emulation. -# Bochs currently supports up to 8 threads running simultaniosly. -# If Bochs is compiled without SMP support, it won't accept values -# different from 1. -# -# RESET_ON_TRIPLE_FAULT: -# Reset the CPU when triple fault occur (highly recommended) rather than -# PANIC. Remember that if you trying to continue after triple fault the -# simulation will be completely bogus ! -# -# IPS: -# Emulated Instructions Per Second. This is the number of IPS that bochs -# is capable of running on your machine. You can recompile Bochs with -# --enable-show-ips option enabled, to find your workstation's capability. -# Measured IPS value will then be logged into your log file or status bar -# (if supported by the gui). -# -# IPS is used to calibrate many time-dependent events within the bochs -# simulation. For example, changing IPS affects the frequency of VGA -# updates, the duration of time before a key starts to autorepeat, and -# the measurement of BogoMips and other benchmarks. -# -# Examples: -# Machine Mips -# ________________________________________________________________ -# 2.1Ghz Athlon XP with Linux 2.6/g++ 3.4 12 to 15 Mips -# 1.6Ghz Intel P4 with Win2000/g++ 3.3 5 to 7 Mips -# 650Mhz Athlon K-7 with Linux 2.4.4/egcs-2.91.66 2 to 2.5 Mips -# 400Mhz Pentium II with Linux 2.0.36/egcs-1.0.3 1 to 1.8 Mips -#======================================================================= -cpu: count=1, ips=10000000, reset_on_triple_fault=1 - -#======================================================================= -# MEGS -# Set the number of Megabytes of physical memory you want to emulate. -# The default is 32MB, most OS's won't need more than that. -# The maximum amount of memory supported is 2048Mb. -#======================================================================= -#megs: 256 -#megs: 128 -#megs: 64 -megs: 32 -#megs: 16 -#megs: 8 - -#======================================================================= -# OPTROMIMAGE[1-4]: -# You may now load up to 4 optional ROM images. Be sure to use a -# read-only area, typically between C8000 and EFFFF. These optional -# ROM images should not overwrite the rombios (located at -# F0000-FFFFF) and the videobios (located at C0000-C7FFF). -# Those ROM images will be initialized by the bios if they contain -# the right signature (0x55AA) and a valid checksum. -# It can also be a convenient way to upload some arbitrary code/data -# in the simulation, that can be retrieved by the boot loader -#======================================================================= -#optromimage1: file=optionalrom.bin, address=0xd0000 -#optromimage2: file=optionalrom.bin, address=0xd1000 -#optromimage3: file=optionalrom.bin, address=0xd2000 -#optromimage4: file=optionalrom.bin, address=0xd3000 -optromimage1: file=../../src/bin/pnic.rom, address=0xd0000 -#optromimage1: file=../../src/bin/rtl8029.rom, address=0xd0000 - -#optramimage1: file=/path/file1.img, address=0x0010000 -#optramimage2: file=/path/file2.img, address=0x0020000 -#optramimage3: file=/path/file3.img, address=0x0030000 -#optramimage4: file=/path/file4.img, address=0x0040000 - -#======================================================================= -# VGAROMIMAGE -# You now need to load a VGA ROM BIOS into C0000. -#======================================================================= -#vgaromimage: file=bios/VGABIOS-elpin-2.40 -vgaromimage: file=bochs/bios/VGABIOS-lgpl-latest -#vgaromimage: file=bios/VGABIOS-lgpl-latest-cirrus - -#======================================================================= -# VGA: -# Here you can specify the display extension to be used. With the value -# 'none' you can use standard VGA with no extension. Other supported -# values are 'vbe' for Bochs VBE and 'cirrus' for Cirrus SVGA support. -#======================================================================= -#vga: extension=cirrus -#vga: extension=vbe -vga: extension=none - -#======================================================================= -# FLOPPYA: -# Point this to pathname of floppy image file or device -# This should be of a bootable floppy(image/device) if you're -# booting from 'a' (or 'floppy'). -# -# You can set the initial status of the media to 'ejected' or 'inserted'. -# floppya: 2_88=path, status=ejected (2.88M 3.5" floppy) -# floppya: 1_44=path, status=inserted (1.44M 3.5" floppy) -# floppya: 1_2=path, status=ejected (1.2M 5.25" floppy) -# floppya: 720k=path, status=inserted (720K 3.5" floppy) -# floppya: 360k=path, status=inserted (360K 5.25" floppy) -# floppya: 320k=path, status=inserted (320K 5.25" floppy) -# floppya: 180k=path, status=inserted (180K 5.25" floppy) -# floppya: 160k=path, status=inserted (160K 5.25" floppy) -# floppya: image=path, status=inserted (guess type from image size) -# -# The path should be the name of a disk image file. On Unix, you can use a raw -# device name such as /dev/fd0 on Linux. On win32 platforms, use drive letters -# such as a: or b: as the path. The parameter 'image' works with image files -# only. In that case the size must match one of the supported types. -#======================================================================= -#floppya: 1_44=/dev/fd0, status=inserted -#floppya: image=../1.44, status=inserted -#floppya: 1_44=/dev/fd0H1440, status=inserted -#floppya: 1_2=../1_2, status=inserted -#floppya: 1_44=a:, status=inserted -#floppya: 1_44=a.img, status=inserted -#floppya: 1_44=/dev/rfd0a, status=inserted -floppya: 1_44=../../src/bin/pnic.dsk, status=inserted - -#======================================================================= -# FLOPPYB: -# See FLOPPYA above for syntax -#======================================================================= -#floppyb: 1_44=b:, status=inserted -floppyb: 1_44=b.img, status=inserted - -#======================================================================= -# ATA0, ATA1, ATA2, ATA3 -# ATA controller for hard disks and cdroms -# -# ata[0-3]: enabled=[0|1], ioaddr1=addr, ioaddr2=addr, irq=number -# -# These options enables up to 4 ata channels. For each channel -# the two base io addresses and the irq must be specified. -# -# ata0 and ata1 are enabled by default with the values shown below -# -# Examples: -# ata0: enabled=1, ioaddr1=0x1f0, ioaddr2=0x3f0, irq=14 -# ata1: enabled=1, ioaddr1=0x170, ioaddr2=0x370, irq=15 -# ata2: enabled=1, ioaddr1=0x1e8, ioaddr2=0x3e0, irq=11 -# ata3: enabled=1, ioaddr1=0x168, ioaddr2=0x360, irq=9 -#======================================================================= -ata0: enabled=1, ioaddr1=0x1f0, ioaddr2=0x3f0, irq=14 -ata1: enabled=1, ioaddr1=0x170, ioaddr2=0x370, irq=15 -ata2: enabled=0, ioaddr1=0x1e8, ioaddr2=0x3e0, irq=11 -ata3: enabled=0, ioaddr1=0x168, ioaddr2=0x360, irq=9 - -#======================================================================= -# ATA[0-3]-MASTER, ATA[0-3]-SLAVE -# -# 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] -# path= path of the image -# cylinders= only valid for disks -# heads= only valid for disks -# spt= only valid for disks -# status= only valid for cdroms [inserted|ejected] -# biosdetect= type of biosdetection [none|auto], only for disks on ata0 [cmos] -# translation=type of translation of the bios, only for disks [none|lba|large|rechs|auto] -# model= string returned by identify device command -# journal= optional filename of the redolog for undoable and volatile disks -# -# Point this at a hard disk image file, cdrom iso file, or physical cdrom -# device. To create a hard disk image, try running bximage. It will help you -# choose the size and then suggest a line that works with it. -# -# In UNIX it may be possible to use a raw device as a Bochs hard disk, -# but WE DON'T RECOMMEND IT. In Windows there is no easy way. -# -# In windows, the drive letter + colon notation should be used for cdroms. -# Depending on versions of windows and drivers, you may only be able to -# access the "first" cdrom in the system. On MacOSX, use path="drive" -# to access the physical drive. -# -# The path is always mandatory. For flat hard disk images created with -# bximage geometry autodetection can be used (cylinders=0 -> cylinders are -# calculated using heads=16 and spt=63). For other hard disk images and modes -# the cylinders, heads, and spt are mandatory. -# -# Default values are: -# mode=flat, biosdetect=auto, translation=auto, model="Generic 1234" -# -# The biosdetect option has currently no effect on the bios -# -# Examples: -# ata0-master: type=disk, mode=flat, path=10M.sample, cylinders=306, heads=4, spt=17 -# ata0-slave: type=disk, mode=flat, path=20M.sample, cylinders=615, heads=4, spt=17 -# ata1-master: type=disk, mode=flat, path=30M.sample, cylinders=615, heads=6, spt=17 -# ata1-slave: type=disk, mode=flat, path=46M.sample, cylinders=940, heads=6, spt=17 -# ata2-master: type=disk, mode=flat, path=62M.sample, cylinders=940, heads=8, spt=17 -# ata2-slave: type=disk, mode=flat, path=112M.sample, cylinders=900, heads=15, spt=17 -# ata3-master: type=disk, mode=flat, path=483M.sample, cylinders=1024, heads=15, spt=63 -# ata3-slave: type=cdrom, path=iso.sample, status=inserted -#======================================================================= -#ata0-master: type=disk, mode=flat, path="30M.sample", cylinders=615, heads=6, spt=17 -#ata0-slave: type=cdrom, path=D:, status=inserted -#ata0-slave: type=cdrom, path=/dev/cdrom, status=inserted -#ata0-slave: type=cdrom, path="drive", status=inserted -#ata0-slave: type=cdrom, path=/dev/rcd0d, status=inserted - -#======================================================================= -# BOOT: -# This defines the boot sequence. Now you can specify up to 3 boot drives. -# You can either boot from 'floppy', 'disk' or 'cdrom' -# legacy 'a' and 'c' are also supported -# Examples: -# boot: floppy -# boot: disk -# boot: cdrom -# boot: c -# boot: a -# boot: cdrom, floppy, disk -#======================================================================= -#boot: floppy -#boot: disk - -#======================================================================= -# CLOCK: -# This defines the parameters of the clock inside Bochs: -# -# SYNC: -# TO BE COMPLETED (see Greg explanation in feature request #536329) -# -# TIME0: -# Specifies the start (boot) time of the virtual machine. Use a time -# value as returned by the time(2) system call. If no time0 value is -# set or if time0 equal to 1 (special case) or if time0 equal 'local', -# the simulation will be started at the current local host time. -# If time0 equal to 2 (special case) or if time0 equal 'utc', -# the simulation will be started at the current utc time. -# -# Syntax: -# clock: sync=[none|slowdown|realtime|both], time0=[timeValue|local|utc] -# -# Example: -# clock: sync=none, time0=local # Now (localtime) -# clock: sync=slowdown, time0=315529200 # Tue Jan 1 00:00:00 1980 -# clock: sync=none, time0=631148400 # Mon Jan 1 00:00:00 1990 -# clock: sync=realtime, time0=938581955 # Wed Sep 29 07:12:35 1999 -# clock: sync=realtime, time0=946681200 # Sat Jan 1 00:00:00 2000 -# clock: sync=none, time0=1 # Now (localtime) -# clock: sync=none, time0=utc # Now (utc/gmt) -# -# Default value are sync=none, time0=local -#======================================================================= -#clock: sync=none, time0=local - - -#======================================================================= -# FLOPPY_BOOTSIG_CHECK: disabled=[0|1] -# Enables or disables the 0xaa55 signature check on boot floppies -# Defaults to disabled=0 -# Examples: -# floppy_bootsig_check: disabled=0 -# floppy_bootsig_check: disabled=1 -#======================================================================= -#floppy_bootsig_check: disabled=1 -floppy_bootsig_check: disabled=0 - -#======================================================================= -# LOG: -# Give the path of the log file you'd like Bochs debug and misc. verbiage -# to be written to. If you don't use this option or set the filename to -# '-' the output is written to the console. If you really don't want it, -# make it "/dev/null" (Unix) or "nul" (win32). :^( -# -# Examples: -# log: ./bochs.out -# log: /dev/tty -#======================================================================= -#log: /dev/null -log: bochsout.txt - -#======================================================================= -# LOGPREFIX: -# This handles the format of the string prepended to each log line. -# You may use those special tokens : -# %t : 11 decimal digits timer tick -# %i : 8 hexadecimal digits of cpu current eip (ignored in SMP configuration) -# %e : 1 character event type ('i'nfo, 'd'ebug, 'p'anic, 'e'rror) -# %d : 5 characters string of the device, between brackets -# -# Default : %t%e%d -# Examples: -# logprefix: %t-%e-@%i-%d -# logprefix: %i%e%d -#======================================================================= -#logprefix: %t%e%d - -#======================================================================= -# LOG CONTROLS -# -# Bochs now has four severity levels for event logging. -# panic: cannot proceed. If you choose to continue after a panic, -# don't be surprised if you get strange behavior or crashes. -# error: something went wrong, but it is probably safe to continue the -# simulation. -# info: interesting or useful messages. -# debug: messages useful only when debugging the code. This may -# spit out thousands per second. -# -# For events of each level, you can choose to crash, report, or ignore. -# TODO: allow choice based on the facility: e.g. crash on panics from -# everything except the cdrom, and only report those. -# -# If you are experiencing many panics, it can be helpful to change -# the panic action to report instead of fatal. However, be aware -# that anything executed after a panic is uncharted territory and can -# cause bochs to become unstable. The panic is a "graceful exit," so -# if you disable it you may get a spectacular disaster instead. -#======================================================================= -panic: action=ask -error: action=report -info: action=report -debug: action=ignore -#pass: action=fatal - -#======================================================================= -# DEBUGGER_LOG: -# Give the path of the log file you'd like Bochs to log debugger output. -# If you really don't want it, make it /dev/null or '-'. :^( -# -# Examples: -# debugger_log: ./debugger.out -#======================================================================= -#debugger_log: /dev/null -#debugger_log: debugger.out -debugger_log: - - -#======================================================================= -# COM1, COM2, COM3, COM4: -# This defines a serial port (UART type 16550A). In the 'term' you can specify -# a device to use as com1. This can be a real serial line, or a pty. To use -# a pty (under X/Unix), create two windows (xterms, usually). One of them will -# run bochs, and the other will act as com1. Find out the tty the com1 -# window using the `tty' command, and use that as the `dev' parameter. -# Then do `sleep 1000000' in the com1 window to keep the shell from -# messing with things, and run bochs in the other window. Serial I/O to -# com1 (port 0x3f8) will all go to the other window. -# Other serial modes are 'null' (no input/output), 'file' (output to a file -# specified as the 'dev' parameter), 'raw' (use the real serial port - under -# construction for win32), 'mouse' (standard serial mouse - requires -# mouse option setting 'type=serial' or 'type=serial_wheel') and 'socket' -# (connect a networking socket). -# -# Examples: -# com1: enabled=1, mode=null -# com1: enabled=1, mode=mouse -# com2: enabled=1, mode=file, dev=serial.out -# com3: enabled=1, mode=raw, dev=com1 -# com3: enabled=1, mode=socket, dev=localhost:8888 -#======================================================================= -#com1: enabled=1, mode=term, dev=/dev/ttyp9 - - -#======================================================================= -# PARPORT1, PARPORT2: -# This defines a parallel (printer) port. When turned on and an output file is -# defined the emulated printer port sends characters printed by the guest OS -# into the output file. On some platforms a device filename can be used to -# send the data to the real parallel port (e.g. "/dev/lp0" on Linux, "lpt1" on -# win32 platforms). -# -# Examples: -# parport1: enabled=1, file="parport.out" -# parport2: enabled=1, file="/dev/lp0" -# parport1: enabled=0 -#======================================================================= -parport1: enabled=1, file="parport.out" - -#======================================================================= -# SB16: -# This defines the SB16 sound emulation. It can have several of the -# following properties. -# All properties are in the format sb16: property=value -# midi: The filename is where the midi data is sent. This can be a -# device or just a file if you want to record the midi data. -# midimode: -# 0=no data -# 1=output to device (system dependent. midi denotes the device driver) -# 2=SMF file output, including headers -# 3=output the midi data stream to the file (no midi headers and no -# delta times, just command and data bytes) -# wave: This is the device/file where wave output is stored -# wavemode: -# 0=no data -# 1=output to device (system dependent. wave denotes the device driver) -# 2=VOC file output, incl. headers -# 3=output the raw wave stream to the file -# log: The file to write the sb16 emulator messages to. -# loglevel: -# 0=no log -# 1=resource changes, midi program and bank changes -# 2=severe errors -# 3=all errors -# 4=all errors plus all port accesses -# 5=all errors and port accesses plus a lot of extra info -# dmatimer: -# microseconds per second for a DMA cycle. Make it smaller to fix -# non-continuous sound. 750000 is usually a good value. This needs a -# reasonably correct setting for the IPS parameter of the CPU option. -# -# For an example look at the next line: -#======================================================================= - -#sb16: midimode=1, midi=/dev/midi00, wavemode=1, wave=/dev/dsp, loglevel=2, log=sb16.log, dmatimer=600000 - -#======================================================================= -# VGA_UPDATE_INTERVAL: -# Video memory is scanned for updates and screen updated every so many -# virtual seconds. The default is 40000, about 25Hz. Keep in mind that -# you must tweak the 'cpu: ips=N' directive to be as close to the number -# of emulated instructions-per-second your workstation can do, for this -# to be accurate. -# -# Examples: -# vga_update_interval: 250000 -#======================================================================= -vga_update_interval: 300000 - -# using for Winstone '98 tests -#vga_update_interval: 100000 - -#======================================================================= -# KEYBOARD_SERIAL_DELAY: -# Approximate time in microseconds that it takes one character to -# be transfered from the keyboard to controller over the serial path. -# Examples: -# keyboard_serial_delay: 200 -#======================================================================= -keyboard_serial_delay: 250 - -#======================================================================= -# KEYBOARD_PASTE_DELAY: -# Approximate time in microseconds between attempts to paste -# characters to the keyboard controller. This leaves time for the -# guest os to deal with the flow of characters. The ideal setting -# depends on how your operating system processes characters. The -# default of 100000 usec (.1 seconds) was chosen because it works -# consistently in Windows. -# -# If your OS is losing characters during a paste, increase the paste -# delay until it stops losing characters. -# -# Examples: -# keyboard_paste_delay: 100000 -#======================================================================= -keyboard_paste_delay: 100000 - -#======================================================================= -# MOUSE: -# This option prevents Bochs from creating mouse "events" unless a mouse -# is enabled. The hardware emulation itself is not disabled by this. -# You can turn the mouse on by setting enabled to 1, or turn it off by -# setting enabled to 0. Unless you have a particular reason for enabling -# the mouse by default, it is recommended that you leave it off. -# You can also toggle the mouse usage at runtime (control key + middle -# mouse button on X11, SDL, wxWidgets and Win32). -# With the mouse type option you can select the type of mouse to emulate. -# The default value is 'ps2'. The other choices are 'imps2' (wheel mouse -# on PS/2), 'serial', 'serial_wheel' (one com port requires setting -# 'mode=mouse') and 'usb' (3-button mouse - one of the USB ports must be -# connected with the 'mouse' device - requires PCI and USB support). -# -# Examples: -# mouse: enabled=1 -# mouse: enabled=1, type=imps2 -# mouse: enabled=1, type=serial -# mouse: enabled=0 -#======================================================================= -mouse: enabled=0 - -#======================================================================= -# private_colormap: Request that the GUI create and use it's own -# non-shared colormap. This colormap will be used -# when in the bochs window. If not enabled, a -# shared colormap scheme may be used. Not implemented -# on all GUI's. -# -# Examples: -# private_colormap: enabled=1 -# private_colormap: enabled=0 -#======================================================================= -private_colormap: enabled=0 - -#======================================================================= -# fullscreen: ONLY IMPLEMENTED ON AMIGA -# Request that Bochs occupy the entire screen instead of a -# window. -# -# Examples: -# fullscreen: enabled=0 -# fullscreen: enabled=1 -#======================================================================= -#fullscreen: enabled=0 -#screenmode: name="sample" - -#======================================================================= -# ne2k: NE2000 compatible ethernet adapter -# -# Examples: -# ne2k: ioaddr=IOADDR, irq=IRQ, mac=MACADDR, ethmod=MODULE, ethdev=DEVICE, script=SCRIPT -# -# ioaddr, irq: You probably won't need to change ioaddr and irq, unless there -# are IRQ conflicts. -# -# mac: The MAC address MUST NOT match the address of any machine on the net. -# Also, the first byte must be an even number (bit 0 set means a multicast -# address), and you cannot use ff:ff:ff:ff:ff:ff because that's the broadcast -# address. For the ethertap module, you must use fe:fd:00:00:00:01. There may -# be other restrictions too. To be safe, just use the b0:c4... address. -# -# ethdev: The ethdev value is the name of the network interface on your host -# platform. On UNIX machines, you can get the name by running ifconfig. On -# Windows machines, you must run niclist to get the name of the ethdev. -# Niclist source code is in misc/niclist.c and it is included in Windows -# binary releases. -# -# script: The script value is optional, and is the name of a script that -# is executed after bochs initialize the network interface. You can use -# this script to configure this network interface, or enable masquerading. -# This is mainly useful for the tun/tap devices that only exist during -# Bochs execution. The network interface name is supplied to the script -# as first parameter -# -# If you don't want to make connections to any physical networks, -# you can use the following 'ethmod's to simulate a virtual network. -# null: All packets are discarded, but logged to a few files. -# arpback: ARP is simulated. Disabled by default. -# vde: Virtual Distributed Ethernet -# vnet: ARP, ICMP-echo(ping), DHCP and read/write TFTP are simulated. -# The virtual host uses 192.168.10.1. -# DHCP assigns 192.168.10.2 to the guest. -# TFTP uses the ethdev value for the root directory and doesn't -# overwrite files. -# -#======================================================================= -# ne2k: ioaddr=0x240, irq=9, mac=fe:fd:00:00:00:01, ethmod=fbsd, ethdev=en0 #macosx -# ne2k: ioaddr=0x240, irq=9, mac=b0:c4:20:00:00:00, ethmod=fbsd, ethdev=xl0 -# ne2k: ioaddr=0x240, irq=9, mac=b0:c4:20:00:00:00, ethmod=linux, ethdev=eth0 -# ne2k: ioaddr=0x240, irq=9, mac=b0:c4:20:00:00:01, ethmod=win32, ethdev=MYCARD -# ne2k: ioaddr=0x240, irq=9, mac=fe:fd:00:00:00:01, ethmod=tap, ethdev=tap0 -# ne2k: ioaddr=0x240, irq=9, mac=fe:fd:00:00:00:01, ethmod=tuntap, ethdev=/dev/net/tun0, script=./tunconfig -# ne2k: ioaddr=0x240, irq=9, mac=b0:c4:20:00:00:01, ethmod=null, ethdev=eth0 -# ne2k: ioaddr=0x240, irq=9, mac=b0:c4:20:00:00:01, ethmod=vde, ethdev="/tmp/vde.ctl" -# ne2k: ioaddr=0x240, irq=9, mac=b0:c4:20:00:00:01, ethmod=vnet, ethdev="c:/temp" -pnic: mac=fe:fd:00:00:00:01, ethmod=tuntap, ethdev=/dev/net/tun:tap0 -#ne2k: ioaddr=0x240, irq=9, mac=fe:fd:00:00:00:01, ethmod=tuntap, ethdev=/dev/net/tun:tap0 - -#======================================================================= -# KEYBOARD_MAPPING: -# This enables a remap of a physical localized keyboard to a -# virtualized us keyboard, as the PC architecture expects. -# If enabled, the keymap file must be specified. -# -# Examples: -# keyboard_mapping: enabled=1, map=gui/keymaps/x11-pc-de.map -#======================================================================= -keyboard_mapping: enabled=0, map= - -#======================================================================= -# KEYBOARD_TYPE: -# Type of keyboard return by a "identify keyboard" command to the -# keyboard controler. It must be one of "xt", "at" or "mf". -# Defaults to "mf". It should be ok for almost everybody. A known -# exception is french macs, that do have a "at"-like keyboard. -# -# Examples: -# keyboard_type: mf -#======================================================================= -#keyboard_type: mf - -#======================================================================= -# USER_SHORTCUT: -# This defines the keyboard shortcut to be sent when you press the "user" -# button in the headerbar. The shortcut string is a combination of maximum -# 3 key names (listed below) separated with a '-' character. The old-style -# syntax (without the '-') still works for the key combinations supported -# in Bochs 2.2.1. -# Valid key names: -# "alt", "bksl", "bksp", "ctrl", "del", "down", "end", "enter", "esc", -# "f1", ... "f12", "home", "ins", "left", "menu", "minus", "pgdwn", "pgup", -# "plus", "right", "shift", "space", "tab", "up", and "win". -# -# Example: -# user_shortcut: keys=ctrl-alt-del -#======================================================================= -user_shortcut: keys=ctrl-alt-del - -#======================================================================= -# I440FXSUPPORT: -# This option controls the presence of the i440FX PCI chipset. You can -# also specify the devices connected to PCI slots. Up to 5 slots are -# available now. These devices are currently supported: ne2k, pcivga, -# pcidev and pcipnic. If Bochs is compiled with Cirrus SVGA support -# you'll have the additional choice 'cirrus'. -# -# Example: -# i440fxsupport: enabled=1, slot1=pcivga, slot2=ne2k -#======================================================================= -i440fxsupport: enabled=1, slot1=pcipnic -#i440fxsupport: enabled=1, slot1=ne2k - -#======================================================================= -# USB1: -# This option controls the presence of the USB root hub which is a part -# of the i440FX PCI chipset. With the portX option you can connect devices -# to the hub (currently supported: 'mouse' and 'keypad'). If you connect -# the mouse to one of the ports and use the mouse option 'type=usb' you'll -# have a 3-button USB mouse. -# -# Example: -# usb1: enabled=1, port1=mouse, port2=keypad -#======================================================================= -#usb1: enabled=1 - -#======================================================================= -# CMOSIMAGE: -# This defines image file that can be loaded into the CMOS RAM at startup. -# The rtc_init parameter controls whether initialize the RTC with values stored -# in the image. By default the time0 argument given to the clock option is used. -# With 'rtc_init=image' the image is the source for the initial time. -# -# Example: -# cmosimage: file=cmos.img, rtc_init=image -#======================================================================= -#cmosimage: file=cmos.img, rtc_init=time0 - -#======================================================================= -# other stuff -#======================================================================= -magic_break: enabled=1 -#load32bitOSImage: os=nullkernel, path=../kernel.img, iolog=../vga_io.log -#load32bitOSImage: os=linux, path=../linux.img, iolog=../vga_io.log, initrd=../initrd.img -#text_snapshot_check: enable - -#------------------------- -# PCI host device mapping -#------------------------- -#pcidev: vendor=0x1234, device=0x5678 - -#======================================================================= -# GDBSTUB: -# Enable GDB stub. See user documentation for details. -# Default value is enabled=0. -#======================================================================= -#gdbstub: enabled=0, port=1234, text_base=0, data_base=0, bss_base=0 - -#======================================================================= -# IPS: -# The IPS directive is DEPRECATED. Use the parameter IPS of the CPU -# directive instead. -#======================================================================= -#ips: 10000000 - -#======================================================================= -# for Macintosh, use the style of pathnames in the following -# examples. -# -# vgaromimage: :bios:VGABIOS-elpin-2.40 -# romimage: file=:bios:BIOS-bochs-latest, address=0xf0000 -# floppya: 1_44=[fd:], status=inserted -#======================================================================= diff --git a/contrib/bochs/qemu-patch b/contrib/bochs/qemu-patch deleted file mode 100644 index 5fb6c09e..00000000 --- a/contrib/bochs/qemu-patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: qemu/cpu-exec.c -=================================================================== -RCS file: /sources/qemu/qemu/cpu-exec.c,v -retrieving revision 1.84 -diff -u -r1.84 cpu-exec.c ---- qemu/cpu-exec.c 29 Jul 2006 19:09:31 -0000 1.84 -+++ qemu/cpu-exec.c 28 Aug 2006 01:54:15 -0000 -@@ -788,6 +788,18 @@ - cpu_loop_exit(); - } - #endif -+#if 1 -+#define MIN_CYCLE_COUNT 100 -+ { -+ static int cycle_count; -+ -+ if (++cycle_count > MIN_CYCLE_COUNT) { -+ cycle_count = 0; -+ env->exception_index = EXCP_INTERRUPT; -+ cpu_loop_exit(); -+ } -+ } -+#endif - } - } else { - env_to_regs(); diff --git a/contrib/bochs/serial-console b/contrib/bochs/serial-console deleted file mode 100755 index 8cd3835c..00000000 --- a/contrib/bochs/serial-console +++ /dev/null @@ -1,278 +0,0 @@ -#!/usr/bin/perl -w - -=head1 NAME - -serial-console - -=head1 SYNOPSIS - -serial-console [options] - -Options: - - -h,--help Display brief help message - -v,--verbose Increase verbosity - -q,--quiet Decrease verbosity - -l,--log FILE Log output to file - -r,--rcfile FILE Modify specified bochsrc file - -=head1 DESCRIPTION - -C<serial-console> provides a virtual serial console for use with -Bochs. Running C<serial-console> creates a pseudo-tty. The master -side of this pty is made available to the user for interaction; the -slave device is written to the Bochs configuration file -(C<bochsrc.txt>) for use by a subsequent Bochs session. - -=head1 EXAMPLES - -=over 4 - -=item C<serial-console> - -Create a virtual serial console for Bochs, modify C<bochsrc.txt> -appropriately. - -=item C<serial-console -r ../.bochsrc -l serial.log> - -Create a virtual serial console for Bochs, modify C<../.bochsrc> -appropriately, log output to C<serial.log>. - -=back - -=head1 INVOCATION - -Before starting Bochs, run C<serial-console> in a different session -(e.g. a different xterm window). When you subsequently start Bochs, -anything that the emulated machine writes to its serial port will -appear in the window running C<serial-console>, and anything typed in -the C<serial-console> window will arrive on the emulated machine's -serial port. - -You do B<not> need to rerun C<serial-console> afresh for each Bochs -session. - -=head1 OPTIONS - -=over 4 - -=item B<-l,--log FILE> - -Log all output (i.e. everything that is printed in the -C<serial-console> window) to the specified file. - -=item B<-r,--rcfile FILE> - -Modify the specified bochsrc file. The file will be updated to -contain the path to the slave side of the psuedo tty that we create. -The original file will be restored when C<serial-console> exits. The -default is to modify the file C<bochsrc.txt> in the current directory. - -To avoid modifying any bochsrc file, use C<--norcfile>. - -=back - -=cut - -use IO::Pty; -use IO::Select; -use File::Spec::Functions qw ( :ALL ); -use Getopt::Long; -use Pod::Usage; -use POSIX qw ( :termios_h ); -use strict; -use warnings; - -my $o; -my $restore_file = {}; -my $restore_termios; -use constant BLOCKSIZE => 8192; - -############################################################################## -# -# Parse command line options into options hash ($o) -# -# $o = parse_opts(); - -sub parse_opts { - # $o is the hash that will hold the options - my $o = { - verbosity => 1, - rcfile => 'bochsrc.txt', - }; - # Special handlers for some options - my $opt_handlers = { - verbose => sub { $o->{verbosity}++; }, - quiet => sub { $o->{verbosity}--; }, - help => sub { pod2usage(1); }, - norcfile => sub { delete $o->{rcfile}; }, - }; - # Merge handlers into main options hash (so that Getopt::Long can find them) - $o->{$_} = $opt_handlers->{$_} foreach keys %$opt_handlers; - # Option specifiers for Getopt::Long - my @optspec = ( 'help|h|?', - 'quiet|q+', - 'verbose|v+', - 'log|l=s', - 'rcfile|r=s', - 'norcfile', - ); - # Do option parsing - Getopt::Long::Configure ( 'bundling' ); - pod2usage("Error parsing command-line options") unless GetOptions ( - $o, @optspec ); - # Clean up $o by removing the handlers - delete $o->{$_} foreach keys %$opt_handlers; - return $o; -} - -############################################################################## -# -# Modify bochsrc file - -sub patch_bochsrc { - my $active = shift; - my $pty = shift; - - # Rename active file to backup file - ( my $vol, my $dir, my $file ) = splitpath ( $active ); - $file = '.'.$file.".serial-console"; - my $backup = catpath ( $vol, $dir, $file ); - rename $active, $backup - or die "Could not back up $active to $backup: $!\n"; - - # Derive line to be inserted - my $patch = "com1: enabled=1, mode=term, dev=$pty\n"; - - # Modify file - open my $old, "<$backup" or die "Could not open $backup: $!\n"; - open my $new, ">$active" or die "Could not open $active: $!\n"; - print $new <<"EOF"; -################################################## -# -# This file has been modified by serial-console. -# -# Do not modify this file; it will be erased when -# serial-console (pid $$) exits and will be -# replaced with the backup copy held in -# $backup. -# -################################################## - - -EOF - my $patched; - while ( my $line = <$old> ) { - if ( $line =~ /^\s*\#?\s*com1:\s*\S/ ) { - if ( ! $patched ) { - $line = $patch; - $patched = 1; - } else { - $line = '# '.$line unless $line =~ /^\s*\#/; - } - } - print $new $line; - } - print $new $patch unless $patched; - close $old; - close $new; - - return $backup; -} - -############################################################################## -# -# Attach/detach message printing and terminal settings - -sub bochs_attached { - print STDERR "Bochs attached.\n\n\n" - if $o->{verbosity} >= 1; -} - -sub bochs_detached { - print STDERR "\n\nWaiting for bochs to attach...\n" - if $o->{verbosity} >= 1; -} - -############################################################################## -# -# Main program - -$o = parse_opts(); -pod2usage(1) if @ARGV; - -# Catch signals -my $sigdie = sub { die "Exiting via signal\n"; }; -$SIG{INT} = $sigdie; - -# Create Pty, close slave side -my $pty = IO::Pty->new(); -$pty->close_slave(); -$pty->set_raw(); -print STDERR "Slave pty is ".$pty->ttyname."\n" if $o->{verbosity} >= 1; - -# Open logfile -my $log; -if ( $o->{log} ) { - open $log, ">$o->{log}" or die "Could not open $o->{log}: $!\n"; -} - -# Set up terminal -my $termios; -if ( -t STDIN ) { - $termios = POSIX::Termios->new; - $restore_termios = POSIX::Termios->new; - $termios->getattr ( fileno(STDIN) ); - $restore_termios->getattr ( fileno(STDIN) ); - $termios->setlflag ( $termios->getlflag & ~(ICANON) & ~(ECHO) ); - $termios->setiflag ( $termios->getiflag & ~(ICRNL) ); - $termios->setattr ( fileno(STDIN), TCSANOW ); -} - -# Modify bochsrc file -$restore_file = { $o->{rcfile} => - patch_bochsrc ( $o->{rcfile}, $pty->ttyname ) } - if $o->{rcfile}; - -# Start character shunt -my $attached = 1; -my $select = IO::Select->new ( \*STDIN, $pty ); -while ( 1 ) { - my %can_read = map { $_ => 1 } - $select->can_read ( $attached ? undef : 1 ); - if ( $can_read{\*STDIN} ) { - sysread ( STDIN, my $data, BLOCKSIZE ) - or die "Cannot read from STDIN: $!\n"; - $pty->syswrite ( $data ); - } - if ( $can_read{$pty} ) { - if ( $pty->sysread ( my $data, BLOCKSIZE ) ) { - # Actual data available - bochs_attached() if $attached == 0; - $attached = 1; - syswrite ( STDOUT, $data ); - $log->syswrite ( $data ) if $log; - } else { - # No data available but select() says we can read. This almost - # certainly indicates that nothing is attached to the slave. - bochs_detached() if $attached == 1; - $attached = 0; - sleep ( 1 ); - } - } else { - bochs_attached() if $attached == 0; - $attached = 1; - } -} - -END { - # Restore bochsrc file if applicable - if ( ( my $orig_file, my $backup_file ) = %$restore_file ) { - unlink $orig_file; - rename $backup_file, $orig_file; - } - # Restore terminal settings if applicable - if ( $restore_termios ) { - $restore_termios->setattr ( fileno(STDIN), TCSANOW ); - } -} diff --git a/contrib/bochs/serial-console.1 b/contrib/bochs/serial-console.1 deleted file mode 100644 index 210de550..00000000 --- a/contrib/bochs/serial-console.1 +++ /dev/null @@ -1,191 +0,0 @@ -.\" Automatically generated by Pod::Man v1.34, Pod::Parser v1.13 -.\" -.\" Standard preamble: -.\" ======================================================================== -.de Sh \" Subsection heading -.br -.if t .Sp -.ne 5 -.PP -\fB\\$1\fR -.PP -.. -.de Sp \" Vertical space (when we can't use .PP) -.if t .sp .5v -.if n .sp -.. -.de Vb \" Begin verbatim text -.ft CW -.nf -.ne \\$1 -.. -.de Ve \" End verbatim text -.ft R -.fi -.. -.\" Set up some character translations and predefined strings. \*(-- will -.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left -.\" double quote, and \*(R" will give a right double quote. | will give a -.\" real vertical bar. \*(C+ will give a nicer C++. Capital omega is used to -.\" do unbreakable dashes and therefore won't be available. \*(C` and \*(C' -.\" expand to `' in nroff, nothing in troff, for use with C<>. -.tr \(*W-|\(bv\*(Tr -.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p' -.ie n \{\ -. ds -- \(*W- -. ds PI pi -. if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch -. if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\" diablo 12 pitch -. ds L" "" -. ds R" "" -. ds C` "" -. ds C' "" -'br\} -.el\{\ -. ds -- \|\(em\| -. ds PI \(*p -. ds L" `` -. ds R" '' -'br\} -.\" -.\" If the F register is turned on, we'll generate index entries on stderr for -.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index -.\" entries marked with X<> in POD. Of course, you'll have to process the -.\" output yourself in some meaningful fashion. -.if \nF \{\ -. de IX -. tm Index:\\$1\t\\n%\t"\\$2" -.. -. nr % 0 -. rr F -.\} -.\" -.\" For nroff, turn off justification. Always turn off hyphenation; it makes -.\" way too many mistakes in technical documents. -.hy 0 -.if n .na -.\" -.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2). -.\" Fear. Run. Save yourself. No user-serviceable parts. -. \" fudge factors for nroff and troff -.if n \{\ -. ds #H 0 -. ds #V .8m -. ds #F .3m -. ds #[ \f1 -. ds #] \fP -.\} -.if t \{\ -. ds #H ((1u-(\\\\n(.fu%2u))*.13m) -. ds #V .6m -. ds #F 0 -. ds #[ \& -. ds #] \& -.\} -. \" simple accents for nroff and troff -.if n \{\ -. ds ' \& -. ds ` \& -. ds ^ \& -. ds , \& -. ds ~ ~ -. ds / -.\} -.if t \{\ -. ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u" -. ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u' -. ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u' -. ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u' -. ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u' -. ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u' -.\} -. \" troff and (daisy-wheel) nroff accents -.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V' -.ds 8 \h'\*(#H'\(*b\h'-\*(#H' -.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#] -.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H' -.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u' -.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#] -.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#] -.ds ae a\h'-(\w'a'u*4/10)'e -.ds Ae A\h'-(\w'A'u*4/10)'E -. \" corrections for vroff -.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u' -.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u' -. \" for low resolution devices (crt and lpr) -.if \n(.H>23 .if \n(.V>19 \ -\{\ -. ds : e -. ds 8 ss -. ds o a -. ds d- d\h'-1'\(ga -. ds D- D\h'-1'\(hy -. ds th \o'bp' -. ds Th \o'LP' -. ds ae ae -. ds Ae AE -.\} -.rm #[ #] #H #V #F C -.\" ======================================================================== -.\" -.IX Title "SERIAL-CONSOLE 1" -.TH SERIAL-CONSOLE 1 "2004-03-10" "perl v5.8.0" "User Contributed Perl Documentation" -.SH "NAME" -serial\-console -.SH "SYNOPSIS" -.IX Header "SYNOPSIS" -serial-console [options] -.PP -Options: -.PP -.Vb 5 -\& -h,--help Display brief help message -\& -v,--verbose Increase verbosity -\& -q,--quiet Decrease verbosity -\& -l,--log FILE Log output to file -\& -r,--rcfile FILE Modify specified bochsrc file -.Ve -.SH "DESCRIPTION" -.IX Header "DESCRIPTION" -\&\f(CW\*(C`serial\-console\*(C'\fR provides a virtual serial console for use with -Bochs. Running \f(CW\*(C`serial\-console\*(C'\fR creates a pseudo\-tty. The master -side of this pty is made available to the user for interaction; the -slave device is written to the Bochs configuration file -(\f(CW\*(C`bochsrc.txt\*(C'\fR) for use by a subsequent Bochs session. -.SH "EXAMPLES" -.IX Header "EXAMPLES" -.ie n .IP """serial\-console""" 4 -.el .IP "\f(CWserial\-console\fR" 4 -.IX Item "serial-console" -Create a virtual serial console for Bochs, modify \f(CW\*(C`bochsrc.txt\*(C'\fR -appropriately. -.ie n .IP """serial\-console \-r ../.bochsrc \-l serial.log""" 4 -.el .IP "\f(CWserial\-console \-r ../.bochsrc \-l serial.log\fR" 4 -.IX Item "serial-console -r ../.bochsrc -l serial.log" -Create a virtual serial console for Bochs, modify \f(CW\*(C`../.bochsrc\*(C'\fR -appropriately, log output to \f(CW\*(C`serial.log\*(C'\fR. -.SH "INVOCATION" -.IX Header "INVOCATION" -Before starting Bochs, run \f(CW\*(C`serial\-console\*(C'\fR in a different session -(e.g. a different xterm window). When you subsequently start Bochs, -anything that the emulated machine writes to its serial port will -appear in the window running \f(CW\*(C`serial\-console\*(C'\fR, and anything typed in -the \f(CW\*(C`serial\-console\*(C'\fR window will arrive on the emulated machine's -serial port. -.PP -You do \fBnot\fR need to rerun \f(CW\*(C`serial\-console\*(C'\fR afresh for each Bochs -session. -.SH "OPTIONS" -.IX Header "OPTIONS" -.IP "\fB\-l,\-\-log \s-1FILE\s0\fR" 4 -.IX Item "-l,--log FILE" -Log all output (i.e. everything that is printed in the -\&\f(CW\*(C`serial\-console\*(C'\fR window) to the specified file. -.IP "\fB\-r,\-\-rcfile \s-1FILE\s0\fR" 4 -.IX Item "-r,--rcfile FILE" -Modify the specified bochsrc file. The file will be updated to -contain the path to the slave side of the psuedo tty that we create. -The original file will be restored when \f(CW\*(C`serial\-console\*(C'\fR exits. The -default is to modify the file \f(CW\*(C`bochsrc.txt\*(C'\fR in the current directory. -.Sp -To avoid modifying any bochsrc file, use \f(CW\*(C`\-\-norcfile\*(C'\fR. diff --git a/contrib/bochs/tunctl.c b/contrib/bochs/tunctl.c deleted file mode 100644 index 6e439060..00000000 --- a/contrib/bochs/tunctl.c +++ /dev/null @@ -1,113 +0,0 @@ -/* Copyright 2002 Jeff Dike - * Licensed under the GPL - */ - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <errno.h> -#include <fcntl.h> -#include <unistd.h> -#include <pwd.h> -#include <net/if.h> -#include <sys/ioctl.h> -#include <linux/if_tun.h> - -static void Usage(char *name) -{ - fprintf(stderr, "Create: %s [-b] [-u owner] [-t device-name] " - "[-f tun-clone-device]\n", name); - fprintf(stderr, "Delete: %s -d device-name [-f tun-clone-device]\n\n", - name); - fprintf(stderr, "The default tun clone device is /dev/net/tun - some systems" - " use\n/dev/misc/net/tun instead\n\n"); - fprintf(stderr, "-b will result in brief output (just the device name)\n"); - exit(1); -} - -int main(int argc, char **argv) -{ - struct ifreq ifr; - struct passwd *pw; - long owner = geteuid(); - int tap_fd, opt, delete = 0, brief = 0; - char *tun = "", *file = "/dev/net/tun", *name = argv[0], *end; - - while((opt = getopt(argc, argv, "bd:f:t:u:")) > 0){ - switch(opt) { - case 'b': - brief = 1; - break; - case 'd': - delete = 1; - tun = optarg; - break; - case 'f': - file = optarg; - break; - case 'u': - pw = getpwnam(optarg); - if(pw != NULL){ - owner = pw->pw_uid; - break; - } - owner = strtol(optarg, &end, 0); - if(*end != '\0'){ - fprintf(stderr, "'%s' is neither a username nor a numeric uid.\n", - optarg); - Usage(name); - } - break; - case 't': - tun = optarg; - break; - case 'h': - default: - Usage(name); - } - } - - argv += optind; - argc -= optind; - - if(argc > 0) - Usage(name); - - if((tap_fd = open(file, O_RDWR)) < 0){ - fprintf(stderr, "Failed to open '%s' : ", file); - perror(""); - exit(1); - } - - memset(&ifr, 0, sizeof(ifr)); - - ifr.ifr_flags = IFF_TAP | IFF_NO_PI; - strncpy(ifr.ifr_name, tun, sizeof(ifr.ifr_name) - 1); - if(ioctl(tap_fd, TUNSETIFF, (void *) &ifr) < 0){ - perror("TUNSETIFF"); - exit(1); - } - - if(delete){ - if(ioctl(tap_fd, TUNSETPERSIST, 0) < 0){ - perror("TUNSETPERSIST"); - exit(1); - } - printf("Set '%s' nonpersistent\n", ifr.ifr_name); - } - else { - if(ioctl(tap_fd, TUNSETPERSIST, 1) < 0){ - perror("TUNSETPERSIST"); - exit(1); - } - if(ioctl(tap_fd, TUNSETOWNER, owner) < 0){ - perror("TUNSETPERSIST"); - exit(1); - } - if(brief) - printf("%s\n", ifr.ifr_name); - else printf("Set '%s' persistent and owned by uid %ld\n", ifr.ifr_name, - owner); - } - return(0); -} |