summaryrefslogtreecommitdiff
path: root/emulators/qemu-devel/files
diff options
context:
space:
mode:
authorJuergen Lock <nox@FreeBSD.org>2011-07-13 20:01:41 +0000
committerJuergen Lock <nox@FreeBSD.org>2011-07-13 20:01:41 +0000
commit85c8cc458dfbb39268c8289f6a6d326ab326de68 (patch)
treebf156f6f9af9fdadf7c66e50b303b3da73871e7a /emulators/qemu-devel/files
parent- Add patch and knob (defaulted to on) to support udp networking (diff)
- Add patches and knob (defaulted to off) to support udp networking
and a patch for promiscuous multicast for the emulated e1000 nic, both to support using qemu with the (also to be updated) emulators/gns3 port. - Change DIST_SUBDIR to qemu/${PORTVERSION} because PATCHFILES names are not versioned. Requested by: Benjamin Epitech <mlspirat42@gmail.com> (via private email) Obtained from: http://code.gns3.net/qemu-patches/
Diffstat (limited to 'emulators/qemu-devel/files')
-rw-r--r--emulators/qemu-devel/files/gns3-qemu-options.hx.patch11
-rw-r--r--emulators/qemu-devel/files/pcap-client-type.sed2
-rw-r--r--emulators/qemu-devel/files/pcap-patch12
3 files changed, 13 insertions, 12 deletions
diff --git a/emulators/qemu-devel/files/gns3-qemu-options.hx.patch b/emulators/qemu-devel/files/gns3-qemu-options.hx.patch
new file mode 100644
index 000000000000..da8bf2903aa4
--- /dev/null
+++ b/emulators/qemu-devel/files/gns3-qemu-options.hx.patch
@@ -0,0 +1,11 @@
+--- a/qemu-options.hx
++++ b/qemu-options.hx
+@@ -1050,6 +1050,8 @@ DEF("net", HAS_ARG, QEMU_OPTION_net,
+ " connect the user mode network stack to VLAN 'n', configure its\n"
+ " DHCP server and enabled optional services\n"
+ #endif
++ "-net udp[,vlan=n],sport=sport,dport=dport,daddr=host\n"
++ " connect the vlan 'n' to a udp host (for dynamips/pemu/GNS3)\n"
+ #ifdef _WIN32
+ "-net tap[,vlan=n][,name=str],ifname=name\n"
+ " connect the host TAP network interface to VLAN 'n'\n"
diff --git a/emulators/qemu-devel/files/pcap-client-type.sed b/emulators/qemu-devel/files/pcap-client-type.sed
new file mode 100644
index 000000000000..cf593878e5d4
--- /dev/null
+++ b/emulators/qemu-devel/files/pcap-client-type.sed
@@ -0,0 +1,2 @@
+/^ NET_CLIENT_TYPE_DUMP$/i\
+\ NET_CLIENT_TYPE_PCAP,
diff --git a/emulators/qemu-devel/files/pcap-patch b/emulators/qemu-devel/files/pcap-patch
index 137f54e42331..0b9fecc89a39 100644
--- a/emulators/qemu-devel/files/pcap-patch
+++ b/emulators/qemu-devel/files/pcap-patch
@@ -85,18 +85,6 @@
if test "$slirp" = "yes" ; then
echo "CONFIG_SLIRP=y" >> $config_host_mak
QEMU_INCLUDES="-I\$(SRC_PATH)/slirp $QEMU_INCLUDES"
---- net.h.orig 2010-01-29 14:36:00.000000000 -0500
-+++ net.h 2010-01-29 14:36:00.000000000 -0500
-@@ -33,7 +33,8 @@ typedef enum {
- NET_CLIENT_TYPE_TAP,
- NET_CLIENT_TYPE_SOCKET,
- NET_CLIENT_TYPE_VDE,
-- NET_CLIENT_TYPE_DUMP
-+ NET_CLIENT_TYPE_DUMP,
-+ NET_CLIENT_TYPE_PCAP
- } net_client_type;
-
- typedef int (NetCanReceive)(VLANClientState *);
Index: net.c
@@ -37,6 +37,11 @@
#include "qemu_socket.h"