54b840b37a
port that now also works for the 32 bit "qemu" executable on amd64 (if you build with the KQEMU knob on, you have to deinstall the old kqemu-kmod first if it is installed) - Add an ALL_TARGETS knob that, if turned off, omits the remaining dyngen targets, eliminating the need for gcc 3.4 (everything but ppc and sh4 has been converted to tcg in this snapshot) - Add tcg fixes for amd64 guests on i386 hosts (two of three have been committed to qemu svn in the meantime) [1] - Update the pkg-message about kqemu on amd64, and add a note about using nfs with slirp, the latter [2] - Homepage now at http://bellard.org/qemu/ - update links Submitted by: nox [1] Submitted by: joerg [2]
40 lines
1.0 KiB
C
40 lines
1.0 KiB
C
Index: qemu/vl.c
|
|
@@ -1727,6 +1728,7 @@
|
|
chr->chr_ioctl = pp_ioctl;
|
|
return chr;
|
|
}
|
|
+#endif /* defined(__linux__) */
|
|
|
|
#else
|
|
CharDriverState *qemu_chr_open_pty(void)
|
|
@@ -2334,7 +2334,7 @@
|
|
}
|
|
#endif
|
|
|
|
-#if defined(__linux__) || defined(__sun__)
|
|
+#if defined(__linux__) || defined(__sun__) || defined(__FreeBSD__)
|
|
static CharDriverState *qemu_chr_open_pty(void)
|
|
{
|
|
struct termios tty;
|
|
@@ -3036,7 +3036,7 @@
|
|
return qemu_chr_open_pp(filename);
|
|
} else
|
|
#endif
|
|
-#if defined(__linux__) || defined(__sun__)
|
|
+#if defined(__linux__) || defined(__sun__) || defined(__FreeBSD__)
|
|
if (strstart(filename, "/dev/", NULL)) {
|
|
return qemu_chr_open_tty(filename);
|
|
} else
|
|
@@ -8423,6 +8423,11 @@
|
|
nb_nics = 0;
|
|
/* default mac address of the first network interface */
|
|
|
|
+#ifdef __FreeBSD__
|
|
+ if (modfind("aio") == -1)
|
|
+ fprintf(stderr, "warning: aio not (kld)loaded, may cause `Invalid system call' traps on disk IO\n");
|
|
+#endif
|
|
+
|
|
optind = 1;
|
|
for(;;) {
|
|
if (optind >= argc)
|