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

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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 chages.

File:

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

contrib/conf/net-qe.sh

@@ -1 +1 @@
 #!/bin/sh
+
+if [ -z "${QEMU_BINARY}" ] ; then
+        QEMU_BINARY="`which --tty-only qemu 2> /dev/null`"
+fi
+
+if [ -z "${QEMU_BINARY}" ] ; then
+        QEMU_BINARY="`which --tty-only qemu-system-x86_64 2> /dev/null`"
+fi
+
+if [ -z "${QEMU_BINARY}" ] ; then
+        QEMU_BINARY="`which --tty-only qemu-system-i386 2> /dev/null`"
+fi
+
+if [ -z "${QEMU_BINARY}" ] ; then
+        echo "QEMU binary not found"
+fi
 
 case "$1" in
         ne2k)
                 shift
-                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
+                "${QEMU_BINARY}" "$@" -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
                 ;;
         e1k)
                 shift
-                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
+                "${QEMU_BINARY}" "$@" -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
                 ;;
         rtl8139)
                 shift
-                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
+                "${QEMU_BINARY}" "$@" -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
                 ;;
         *)