mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-05 01:55:52 +00:00
104 lines
2.5 KiB
Plaintext
104 lines
2.5 KiB
Plaintext
Index: qemu/vl.c
|
|
@@ -43,6 +43,9 @@
|
|
#ifndef __APPLE__
|
|
#include <libutil.h>
|
|
#endif
|
|
+#ifdef __FreeBSD__
|
|
+#include <sys/module.h>
|
|
+#endif
|
|
#else
|
|
#include <linux/if.h>
|
|
#include <linux/if_tun.h>
|
|
@@ -1059,6 +1062,34 @@
|
|
|
|
#endif /* CONFIG_SLIRP */
|
|
|
|
+#ifdef __FreeBSD__
|
|
+#define LOAD_QUIETLY 1
|
|
+#define LOAD_VERBOSLY 2
|
|
+
|
|
+int
|
|
+loadmodules(int how, const char *module, ...)
|
|
+{
|
|
+ int loaded = 0;
|
|
+ va_list ap;
|
|
+
|
|
+ va_start(ap, module);
|
|
+#ifndef NO_MODULES
|
|
+ while (module != NULL) {
|
|
+ if (modfind(module) == -1) {
|
|
+ if (kldload(module) == -1) {
|
|
+ if (how == LOAD_VERBOSLY)
|
|
+ fprintf(stderr, "%s: Cannot load module\n", module);
|
|
+ } else
|
|
+ loaded++;
|
|
+ }
|
|
+ module = va_arg(ap, const char *);
|
|
+ }
|
|
+ va_end(ap);
|
|
+#endif
|
|
+ return loaded;
|
|
+}
|
|
+#endif
|
|
+
|
|
#if !defined(_WIN32)
|
|
#ifdef _BSD
|
|
static int tun_open(char *ifname, int ifname_size)
|
|
@@ -1067,11 +1098,55 @@
|
|
char *dev;
|
|
struct stat s;
|
|
|
|
+#ifdef __FreeBSD__
|
|
+ int i, kldtried = 0, enoentcount = 0, err = 0;
|
|
+ char dname[100];
|
|
+#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
|
|
+ snprintf(dname, sizeof dname, "%s%d",
|
|
+ "/dev/tap", i);
|
|
+ fd = open(dname, O_RDWR);
|
|
+ if (fd >= 0)
|
|
+ break;
|
|
+ else if (errno == ENXIO || errno == ENOENT) {
|
|
+ if (i == 0 && !kldtried++) {
|
|
+ /*
|
|
+ * Attempt to load the tunnel interface KLD if it isn't loaded
|
|
+ * already.
|
|
+ */
|
|
+ if (loadmodules(LOAD_VERBOSLY, "if_tap", NULL))
|
|
+ i = -1;
|
|
+ continue;
|
|
+ }
|
|
+ if (errno != ENOENT || ++enoentcount > 3) {
|
|
+ err = errno;
|
|
+ break;
|
|
+ }
|
|
+ } else
|
|
+ err = errno;
|
|
+ }
|
|
+ if (fd < 0) {
|
|
+ fprintf(stderr, "warning: could not open %s (%s): no virtual network emulation\n", dname, strerror(err));
|
|
+ return -1;
|
|
+ }
|
|
+#else
|
|
fd = open("/dev/tap", O_RDWR);
|
|
if (fd < 0) {
|
|
- fprintf(stderr, "warning: could not open /dev/tap: no virtual network emulation\n");
|
|
+ fprintf(stderr, "warning: could not open /dev/tap (%s): no virtual network emulation\n", strerror(errno));
|
|
return -1;
|
|
}
|
|
+#endif
|
|
|
|
fstat(fd, &s);
|
|
dev = devname(s.st_rdev, S_IFCHR);
|