Changeset dffabf0 in mainline for contrib/conf/net-qe.sh

Timestamp:

2011-01-05T19:08:03Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f03d3786

Parents:

e84d65a (diff), 196ef08 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Conflicts: no problem solving.
Added new apps to ignore list.

File:

• contrib/conf/net-qe.sh (modified) (1 diff)

contrib/conf/net-qe.sh

@@ -1 +1 @@
 #!/bin/sh
 
-arguments="-vga std -M isapc -net nic,model=ne2k_isa -net user -boot d -redir udp:8080::8080 -redir udp:8081::8081 -redir tcp:8080::8080 -redir tcp:8081::8081 -cdrom image.iso"
+# Obsolete versions of QEMU
+#
+#   QEMU 0.10.2 and later 0.10.*
+#    qemu $@ -no-kqemu -vga std -M isapc -net nic,model=ne2k_isa -net user -boot d -redir udp:8080::8080 -redir udp:8081::8081 -redir tcp:8080::8080 -redir tcp:8081::8081 -cdrom image.iso
+#
+#   QEMU 0.11.* and 0.12.*
+#    qemu $@ -vga std -M isapc -net nic,model=ne2k_isa -net user -boot d -redir udp:8080::8080 -redir udp:8081::8081 -redir tcp:8080::8080 -redir tcp:8081::8081 -cdrom image.iso
 
-#qemu 0.10.2 and later 0.10.*:
-#qemu $@ -no-kqemu $arguments
-
-#qemu 0.11:
-qemu $@ $arguments
+# QEMU 0.13 and later
+qemu $@ -device ne2k_isa,irq=5,vlan=0 -net user -boot d -redir udp:8080::8080 -redir udp:8081::8081 -redir tcp:8080::8080 -redir tcp:8081::8081 -cdrom image.iso