summaryrefslogtreecommitdiff
path: root/emulators/qemu/patches/patch-ac
diff options
context:
space:
mode:
Diffstat (limited to 'emulators/qemu/patches/patch-ac')
-rw-r--r--emulators/qemu/patches/patch-ac50
1 files changed, 46 insertions, 4 deletions
diff --git a/emulators/qemu/patches/patch-ac b/emulators/qemu/patches/patch-ac
index 42b00b339a6..77d0ed15955 100644
--- a/emulators/qemu/patches/patch-ac
+++ b/emulators/qemu/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.4 2005/11/04 21:09:15 dbj Exp $
+$NetBSD: patch-ac,v 1.5 2006/01/02 12:19:52 blymn Exp $
---- vl.c.orig 2005-04-27 16:52:05.000000000 -0400
+--- vl.c.orig 2005-12-20 09:21:53.000000000 +1030
+++ vl.c
@@ -34,7 +34,11 @@
#include <sys/times.h>
@@ -14,7 +14,7 @@ $NetBSD: patch-ac,v 1.4 2005/11/04 21:09:15 dbj Exp $
#include <sys/mman.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
-@@ -43,8 +47,10 @@
+@@ -44,8 +48,10 @@
#ifdef _BSD
#include <sys/stat.h>
#ifndef __APPLE__
@@ -25,7 +25,7 @@ $NetBSD: patch-ac,v 1.4 2005/11/04 21:09:15 dbj Exp $
#else
#include <linux/if.h>
#include <linux/if_tun.h>
-@@ -68,7 +74,7 @@
+@@ -70,7 +76,7 @@
#ifdef CONFIG_SDL
#ifdef __APPLE__
@@ -34,3 +34,45 @@ $NetBSD: patch-ac,v 1.4 2005/11/04 21:09:15 dbj Exp $
#endif
#endif /* CONFIG_SDL */
+@@ -1388,7 +1394,7 @@ CharDriverState *qemu_chr_open_stdio(voi
+ return chr;
+ }
+
+-#if defined(__linux__)
++#if defined(__linux__) || defined(__NetBSD__)
+ CharDriverState *qemu_chr_open_pty(void)
+ {
+ struct termios tty;
+@@ -1545,6 +1551,9 @@ CharDriverState *qemu_chr_open_tty(const
+
+ static int pp_ioctl(CharDriverState *chr, int cmd, void *arg)
+ {
++#ifdef __NetBSD__
++ return -ENOTSUP;
++#else
+ int fd = (int)chr->opaque;
+ uint8_t b;
+
+@@ -1578,10 +1587,14 @@ static int pp_ioctl(CharDriverState *chr
+ return -ENOTSUP;
+ }
+ return 0;
++#endif
+ }
+
+ CharDriverState *qemu_chr_open_pp(const char *filename)
+ {
++#ifdef __NetBSD__
++ return NULL;
++#else
+ CharDriverState *chr;
+ int fd;
+
+@@ -1604,6 +1617,7 @@ CharDriverState *qemu_chr_open_pp(const
+ chr->chr_add_read_handler = null_chr_add_read_handler;
+ chr->chr_ioctl = pp_ioctl;
+ return chr;
++#endif
+ }
+
+ #else