summaryrefslogtreecommitdiff
path: root/emulators/qemu-devel/files/patch-vl.c
diff options
context:
space:
mode:
authorJuergen Lock <nox@FreeBSD.org>2010-01-17 16:20:56 +0000
committerJuergen Lock <nox@FreeBSD.org>2010-01-17 16:20:56 +0000
commitd4e517700042730d5420402bec25ccfa88fed6c8 (patch)
treefa8e73dd336e8f03ab2c5b0677215cf74cc8885a /emulators/qemu-devel/files/patch-vl.c
parentAdd cl-trivial-features, which ensures consistent *FEATURES* across multiple (diff)
Finally bring qemu 0.12.1 into ports as the new emulators/qemu-devel,
release announcement is here: http://lists.gnu.org/archive/html/qemu-devel/2009-12/msg02151.html Quoting from pkg-message: - kqemu is no longer supported in qemu upstream after the 0.11 branch was created, which means also not in this version. (Linux has moved on to kvm now for qemu(-like) virtualization needs, so if you want qemu to go faster and don't want to switch to virtualbox or stick to the older emulators/qemu port which is at 0.11.1 atm and as such still supports kqemu you should help getting the FreeBSD kvm port updated and completed: http://wiki.freebsd.org/FabioChecconi/PortingLinuxKVMToFreeBSD )
Notes
Notes: svn path=/head/; revision=248018
Diffstat (limited to 'emulators/qemu-devel/files/patch-vl.c')
-rw-r--r--emulators/qemu-devel/files/patch-vl.c42
1 files changed, 6 insertions, 36 deletions
diff --git a/emulators/qemu-devel/files/patch-vl.c b/emulators/qemu-devel/files/patch-vl.c
index 557508452062..890da597f323 100644
--- a/emulators/qemu-devel/files/patch-vl.c
+++ b/emulators/qemu-devel/files/patch-vl.c
@@ -1,39 +1,9 @@
Index: qemu/vl.c
-@@ -1727,6 +1728,7 @@
- chr->chr_ioctl = pp_ioctl;
- return chr;
- }
-+#endif /* defined(__linux__) */
-
+@@ -57,6 +57,7 @@
+ #include <sys/stat.h>
+ #if defined(__FreeBSD__) || defined(__DragonFly__)
+ #include <libutil.h>
++#include <sys/param.h>
#else
- CharDriverState *qemu_chr_open_pty(void)
-@@ -2334,7 +2334,7 @@
- }
+ #include <util.h>
#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)