diff options
| author | Jeremy Messenger <mezz@FreeBSD.org> | 2004-06-15 02:19:41 +0000 |
|---|---|---|
| committer | Jeremy Messenger <mezz@FreeBSD.org> | 2004-06-15 02:19:41 +0000 |
| commit | c25e186386beca25cb7fa3fd02df65f8d099ddaa (patch) | |
| tree | ff401d1177b1088b33c197b6ea4c55f9f5ed50e8 /emulators/qemu-devel/files | |
| parent | a29a3dda2fd7d5b739148444ffb3d73d078b4de7 (diff) | |
| download | ports-c25e186386beca25cb7fa3fd02df65f8d099ddaa.tar.gz ports-c25e186386beca25cb7fa3fd02df65f8d099ddaa.zip | |
Update to 0615 snapshot.
PR: ports/67950
Submitted by: Juergen Lock <nox@jelal.kn-bremen.de> (maintainer)
Notes
Notes:
svn path=/head/; revision=111509
Diffstat (limited to 'emulators/qemu-devel/files')
| -rw-r--r-- | emulators/qemu-devel/files/patch-bt | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/emulators/qemu-devel/files/patch-bt b/emulators/qemu-devel/files/patch-bt index 7ebddc06f332..bba4776a22d5 100644 --- a/emulators/qemu-devel/files/patch-bt +++ b/emulators/qemu-devel/files/patch-bt @@ -9,7 +9,7 @@ Index: qemu/vl.c #else #include <linux/if.h> #include <linux/if_tun.h> -@@ -1022,6 +1025,34 @@ +@@ -1059,6 +1062,34 @@ #endif /* CONFIG_SLIRP */ @@ -44,14 +44,23 @@ Index: qemu/vl.c #if !defined(_WIN32) #ifdef _BSD static int tun_open(char *ifname, int ifname_size) -@@ -1030,11 +1061,46 @@ +@@ -1067,11 +1098,55 @@ char *dev; struct stat s; +#ifdef __FreeBSD__ + int i, kldtried = 0, enoentcount = 0, err = 0; + char dname[100]; -+ for (i = -1; i < 10; i++) { ++#ifdef USE_DEVTAP ++ /* ++ * 5.x has /dev/tap, but that seems to just blindly increase its ++ * couter on every open() for some people(??), i.e. on every qemu run. ++ */ ++ i = -1; ++#else ++ i = 0; ++#endif ++ for (; i < 10; i++) { + if (i == -1) + strcpy(dname, "/dev/tap"); + else |