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


Ignore:
Timestamp:
2011-12-31T10:01:19Z (13 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
96cd5b4
Parents:
3819ce5 (diff), 852052d (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 with mainline

File:
1 edited

Legend:

Unmodified
Added
Removed

  • contrib/conf/net-qe.sh

    r3819ce5 recf823a  
    1010                qemu $@ -device e1000,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
    1111                ;;
     12        rtl8139)
     13                shift
     14                qemu $@ -device rtl8139,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
     15                ;;
    1216        *)
    13                 echo "Usage: $0 {ne2k|e1k}"
     17                echo "Usage: $0 {ne2k|e1k|rtl8139}"
    1418esac
Note: See TracChangeset for help on using the changeset viewer.