Build bochs with ne2000 support, and add sample lines in bochsrc.txt

to match.

diff --git a/contrib/bochs/README b/contrib/bochs/README
index 71831ed..57c6f05 100644 (file)
--- a/contrib/bochs/README
+++ b/contrib/bochs/README
@@ -27,7 +27,7 @@ To get bochs running is fairly simple:
       pushd bochs
       ./configure --enable-all-optimisations --enable-pci --enable-pnic \
                   --enable-debugger --enable-magic-breakpoints \
-                 --enable-disasm --enable-show-ips
+                 --enable-disasm --enable-show-ips --enable-ne2000
       popd
 
 4.  Build bochs:

diff --git a/contrib/bochs/bochsrc.txt b/contrib/bochs/bochsrc.txt
index 1e43c93..bf99f4c 100644 (file)
--- a/contrib/bochs/bochsrc.txt
+++ b/contrib/bochs/bochsrc.txt
@@ -145,6 +145,7 @@ megs: 32
 #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
@@ -631,6 +632,7 @@ private_colormap: enabled=0
 # 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:
@@ -684,6 +686,7 @@ user_shortcut: keys=ctrl-alt-del
 #   i440fxsupport: enabled=1, slot1=pcivga, slot2=ne2k
 #=======================================================================
 i440fxsupport: enabled=1, slot1=pcipnic
+#i440fxsupport: enabled=1, slot1=ne2k
 
 #=======================================================================
 # USB1: