summaryrefslogtreecommitdiff
path: root/emulators/qemu-devel/files/patch-vl.c
diff options
context:
space:
mode:
authorJuergen Lock <nox@FreeBSD.org>2008-07-08 18:42:09 +0000
committerJuergen Lock <nox@FreeBSD.org>2008-07-08 18:42:09 +0000
commit54b840b37a44ced448a8ad0f47740ce08278f643 (patch)
treed4801d39b61ef12632cbef1176de598a3d1658c2 /emulators/qemu-devel/files/patch-vl.c
parent- New port: plt-scheme (diff)
- Update to 20080620 svn snapshot, which uses the new kqemu-kmod-devel
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]
Notes
Notes: svn path=/head/; revision=216547
Diffstat (limited to 'emulators/qemu-devel/files/patch-vl.c')
-rw-r--r--emulators/qemu-devel/files/patch-vl.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/emulators/qemu-devel/files/patch-vl.c b/emulators/qemu-devel/files/patch-vl.c
index ec763da3848a..557508452062 100644
--- a/emulators/qemu-devel/files/patch-vl.c
+++ b/emulators/qemu-devel/files/patch-vl.c
@@ -7,23 +7,15 @@ Index: qemu/vl.c
#else
CharDriverState *qemu_chr_open_pty(void)
-@@ -1771,14 +1771,14 @@
- return chr;
+@@ -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;
- char slave_name[1024];
- int master_fd, slave_fd;
-
--#if defined(__linux__)
-+#if defined(__linux__) || defined(__FreeBSD__)
- /* Not satisfying */
- if (openpty(&master_fd, &slave_fd, slave_name, NULL, NULL) < 0) {
- return NULL;
@@ -3036,7 +3036,7 @@
return qemu_chr_open_pp(filename);
} else