Enable pty opening for serial port emulation under NetBSD.

2 files changed, 48 insertions, 6 deletions

diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 28a4124226b..161e615c7a5 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.17 2006/01/01 19:12:54 hubertf Exp $
+$NetBSD: distinfo,v 1.18 2006/01/02 12:19:52 blymn Exp $
 
 SHA1 (qemu-0.8.0.tar.gz) = f7bcf2f0eee9e5207cba265f3c47ae781244628e
 RMD160 (qemu-0.8.0.tar.gz) = 3fc6da938f75364d0805ca0ecf8cb84a4b546dc7
 Size (qemu-0.8.0.tar.gz) = 1497965 bytes
 SHA1 (patch-aa) = 455575215bad8864da285e1979da9ff7d8476a24
 SHA1 (patch-ab) = 449195421ad1dbb2592f694d1c4b80f2ea35113c
-SHA1 (patch-ac) = fa190b38658ad487a6ddf6d78cc3cbb262c67702
+SHA1 (patch-ac) = 60dce2f65065d1c2ccc1121ca2b001eec7a73bfc
 SHA1 (patch-af) = 221d6d85aa898cb27462806faab58ee2a9871a1c
 SHA1 (patch-ag) = 86df0bb94e71d87cf61d19404b53e3572384874e
 SHA1 (patch-ah) = 134f47583dbed94e83671ca6197106805b13f759
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