Fix serial port on pty (serial = 'pty' configuration directive) for

HVM guests. Tested with a NetBSD 4.0.1 i386 boot cd with console on com0.
PKGREVISION++

5 files changed, 47 insertions, 21 deletions

diff --git a/sysutils/xentools3-hvm/Makefile b/sysutils/xentools3-hvm/Makefile
index f62b7b3fc2b..f35dccec3d0 100644
--- a/sysutils/xentools3-hvm/Makefile
+++ b/sysutils/xentools3-hvm/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2009/03/31 17:37:36 bouyer Exp $
+# $NetBSD: Makefile,v 1.13 2009/10/18 21:28:10 bouyer Exp $
 #
 
 VERSION=		3.1.4
 DISTNAME=		xen-${VERSION}
 PKGNAME=		xentools3-hvm-${VERSION}
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		sysutils
 MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${VERSION}/
 
diff --git a/sysutils/xentools3-hvm/distinfo b/sysutils/xentools3-hvm/distinfo
index 8d8b2e6762a..b6811150881 100644
--- a/sysutils/xentools3-hvm/distinfo
+++ b/sysutils/xentools3-hvm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2009/03/31 17:37:36 bouyer Exp $
+$NetBSD: distinfo,v 1.9 2009/10/18 21:28:10 bouyer Exp $
 
 SHA1 (xen-3.1.4.tar.gz) = 0d784662776239195df10b3f29d40350f9d0644d
 RMD160 (xen-3.1.4.tar.gz) = c02ad2bd64e6306b127a4f37a8aa370dadc11859
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = 663c798a472501d4c38add5049faded5b7e807aa
 SHA1 (patch-an) = 37650fa861ed8219aa0682e84c5c8ba41a8cdff0
 SHA1 (patch-ao) = 500f1921a73e3a4b7aa91bbd819a26f2327ac8b5
 SHA1 (patch-ap) = 33f2bdbef6df3f2105d4502b8066abb6c952fc6c
-SHA1 (patch-ar) = c8748761267dd82c75deab79d13b71d56bcf2223
+SHA1 (patch-ar) = 16d551946bdbc0f712548e3dbac0913b0fcccb44
 SHA1 (patch-as) = 8850108d0c8f101642f4855184253824f9c214b5
 SHA1 (patch-at) = 2311289176c83fcd3ff18b90bab9c2e5e05a52f1
 SHA1 (patch-au) = b2357fdaff2895a5e4da4371d72ccc3041c78a83
diff --git a/sysutils/xentools3-hvm/patches/patch-ar b/sysutils/xentools3-hvm/patches/patch-ar
index db2c5df827a..a665a362451 100644
--- a/sysutils/xentools3-hvm/patches/patch-ar
+++ b/sysutils/xentools3-hvm/patches/patch-ar
@@ -1,7 +1,7 @@
-$NetBSD: patch-ar,v 1.1.1.1 2007/06/14 19:42:12 bouyer Exp $
+$NetBSD: patch-ar,v 1.2 2009/10/18 21:28:10 bouyer Exp $
 
---- ioemu/vl.c.orig	2007-05-18 16:45:21.000000000 +0200
-+++ ioemu/vl.c	2007-06-12 23:59:27.000000000 +0200
+--- ioemu/vl.c.orig	2008-04-25 15:03:12.000000000 +0200
++++ ioemu/vl.c	2009-10-18 22:22:56.000000000 +0200
 @@ -37,14 +37,17 @@
  #include <sys/poll.h>
  #include <sys/mman.h>
@@ -32,7 +32,7 @@ $NetBSD: patch-ar,v 1.1.1.1 2007/06/14 19:42:12 bouyer Exp $
  
  //#define DEBUG_UNUSED_IOPORT
  //#define DEBUG_IOPORT
-@@ -1663,7 +1666,7 @@
+@@ -1683,7 +1686,7 @@
      return 0;
  }
  
@@ -41,7 +41,20 @@ $NetBSD: patch-ar,v 1.1.1.1 2007/06/14 19:42:12 bouyer Exp $
  CharDriverState *qemu_chr_open_pty(void)
  {
      struct termios tty;
-@@ -1814,7 +1817,7 @@
+@@ -1696,7 +1699,12 @@
+     
+     /* Set raw attributes on the pty. */
+     cfmakeraw(&tty);
++#if defined(__NetBSD__)
++    tcsetattr(master_fd, TCSAFLUSH, &tty);
++    close(slave_fd);
++#else
+     tcsetattr(slave_fd, TCSAFLUSH, &tty);
++#endif
+     
+     fprintf(stderr, "char device redirected to %s\n", ptsname(master_fd));
+ 
+@@ -1834,7 +1842,7 @@
      chr->chr_ioctl = tty_serial_ioctl;
      return chr;
  }
@@ -50,7 +63,7 @@ $NetBSD: patch-ar,v 1.1.1.1 2007/06/14 19:42:12 bouyer Exp $
  static int pp_ioctl(CharDriverState *chr, int cmd, void *arg)
  {
      int fd = (int)chr->opaque;
-@@ -1877,13 +1880,14 @@
+@@ -1897,13 +1905,14 @@
      chr->chr_ioctl = pp_ioctl;
      return chr;
  }
@@ -66,7 +79,7 @@ $NetBSD: patch-ar,v 1.1.1.1 2007/06/14 19:42:12 bouyer Exp $
  
  #endif /* !defined(_WIN32) */
  
-@@ -3126,7 +3130,7 @@
+@@ -3146,7 +3155,7 @@
      fclose(f);
      atexit(smb_exit);
  
@@ -75,7 +88,7 @@ $NetBSD: patch-ar,v 1.1.1.1 2007/06/14 19:42:12 bouyer Exp $
               smb_conf);
      
      slirp_add_exec(0, smb_cmdline, 4, 139);
-@@ -3190,16 +3194,26 @@
+@@ -3210,16 +3219,26 @@
      int fd;
      char *dev;
      struct stat s;
@@ -103,7 +116,7 @@ $NetBSD: patch-ar,v 1.1.1.1 2007/06/14 19:42:12 bouyer Exp $
  
      fcntl(fd, F_SETFL, O_NONBLOCK);
      return fd;
-@@ -5934,7 +5948,6 @@
+@@ -5972,7 +5991,6 @@
      nr_buckets = (((MAX_MCACHE_SIZE >> PAGE_SHIFT) +
                     (1UL << (MCACHE_BUCKET_SHIFT - PAGE_SHIFT)) - 1) >>
                    (MCACHE_BUCKET_SHIFT - PAGE_SHIFT));
@@ -111,7 +124,7 @@ $NetBSD: patch-ar,v 1.1.1.1 2007/06/14 19:42:12 bouyer Exp $
  
      /*
       * Use mmap() directly: lets us allocate a big hash table with no up-front
-@@ -5943,8 +5956,9 @@
+@@ -5981,8 +5999,9 @@
       */
      size = nr_buckets * sizeof(struct map_cache);
      size = (size + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1);
@@ -122,7 +135,7 @@ $NetBSD: patch-ar,v 1.1.1.1 2007/06/14 19:42:12 bouyer Exp $
      if (mapcache_entry == MAP_FAILED) {
          errno = ENOMEM;
          return -1;
-@@ -6081,6 +6095,7 @@
+@@ -6119,6 +6138,7 @@
      unsigned long ioreq_pfn;
      extern void *shared_page;
      extern void *buffered_io_page;
@@ -130,7 +143,7 @@ $NetBSD: patch-ar,v 1.1.1.1 2007/06/14 19:42:12 bouyer Exp $
  #ifdef __ia64__
      unsigned long nr_pages;
      xen_pfn_t *page_array;
-@@ -6089,6 +6104,32 @@
+@@ -6127,6 +6147,32 @@
  
      char qemu_dm_logfilename[64];
  
diff --git a/sysutils/xentools33/distinfo b/sysutils/xentools33/distinfo
index 554813cd2fb..1db541c954c 100644
--- a/sysutils/xentools33/distinfo
+++ b/sysutils/xentools33/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2009/08/07 12:49:21 cegger Exp $
+$NetBSD: distinfo,v 1.18 2009/10/18 21:28:10 bouyer Exp $
 
 SHA1 (xen-3.3.2.tar.gz) = 7f438e73ac81b25cf5e1570709e87001066bafe4
 RMD160 (xen-3.3.2.tar.gz) = 28faa56286f2a418e35dcba6079570ea871d6c7b
@@ -46,6 +46,6 @@ SHA1 (patch-ef) = c8740b1c9cfac686f2e4e32c7613b5f02206459d
 SHA1 (patch-eg) = 84e816c95167828314ef901e324772249a407c41
 SHA1 (patch-fa) = b4a4b7334357ebcd1646886c18c9772e8b9ae765
 SHA1 (patch-fb) = 22a07628566b43aa786c410927d29a283e8cf141
-SHA1 (patch-fc) = 37c9b0897182de93a01f9620ef6346ef68157770
+SHA1 (patch-fc) = d5afc1a1e16f26203a5615142efda8fade48b371
 SHA1 (patch-fd) = cb4741bf33050d72cfbcd2eff4a8632d976de643
 SHA1 (patch-fe) = 85d42672766fe8ce2dc7f745938722710c6ee5a3
diff --git a/sysutils/xentools33/patches/patch-fc b/sysutils/xentools33/patches/patch-fc
index 9affdd4a8dd..8e3715f3c77 100644
--- a/sysutils/xentools33/patches/patch-fc
+++ b/sysutils/xentools33/patches/patch-fc
@@ -1,7 +1,7 @@
-$NetBSD: patch-fc,v 1.2 2008/08/15 14:06:54 cegger Exp $
+$NetBSD: patch-fc,v 1.3 2009/10/18 21:28:10 bouyer Exp $
 
---- ioemu/vl.c.orig	2008-08-14 15:26:06.000000000 +0000
-+++ ioemu/vl.c
+--- ioemu/vl.c.orig	2009-01-05 12:26:59.000000000 +0100
++++ ioemu/vl.c	2009-10-18 23:08:55.000000000 +0200
 @@ -108,7 +108,7 @@
  
  #include "exec-all.h"
@@ -20,3 +20,16 @@ $NetBSD: patch-fc,v 1.2 2008/08/15 14:06:54 cegger Exp $
  #endif
  
  //#define DEBUG_UNUSED_IOPORT
+@@ -1914,8 +1914,11 @@
+     }
+     
+     /* Set raw attributes on the pty. */
++    if (tcgetattr(master_fd, &tty) < 0)
++	perror("tcgetattr");
+     cfmakeraw(&tty);
+-    tcsetattr(slave_fd, TCSAFLUSH, &tty);
++    if (tcsetattr(slave_fd, TCSAFLUSH, &tty) < 0)
++	perror("tcsetattr");
+ 
+     fprintf(stderr, "char device redirected to %s\n", ptsname(master_fd));
+