Sun Oct 18 21:28:10 2009 UTC ()
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++


(bouyer)
diff -r1.12 -r1.13 pkgsrc/sysutils/xentools3-hvm/Makefile
diff -r1.8 -r1.9 pkgsrc/sysutils/xentools3-hvm/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/xentools3-hvm/patches/patch-ar
diff -r1.17 -r1.18 pkgsrc/sysutils/xentools33/distinfo
diff -r1.2 -r1.3 pkgsrc/sysutils/xentools33/patches/patch-fc
cvs diff -r1.12 -r1.13 pkgsrc/sysutils/xentools3-hvm/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools3-hvm/Attic/Makefile 2009/03/31 17:37:36 1.12
+++ pkgsrc/sysutils/xentools3-hvm/Attic/Makefile 2009/10/18 21:28:10 1.13
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.12 2009/03/31 17:37:36 bouyer Exp $ 1# $NetBSD: Makefile,v 1.13 2009/10/18 21:28:10 bouyer Exp $
2# 2#
3 3
4VERSION= 3.1.4 4VERSION= 3.1.4
5DISTNAME= xen-${VERSION} 5DISTNAME= xen-${VERSION}
6PKGNAME= xentools3-hvm-${VERSION} 6PKGNAME= xentools3-hvm-${VERSION}
7PKGREVISION= 3 7PKGREVISION= 4
8CATEGORIES= sysutils 8CATEGORIES= sysutils
9MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ 9MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/
10 10
11MAINTAINER= bouyer@NetBSD.org 11MAINTAINER= bouyer@NetBSD.org
12HOMEPAGE= http://xen.org/ 12HOMEPAGE= http://xen.org/
13COMMENT= Tools for Virtual Machine Extensions support in Xen 13COMMENT= Tools for Virtual Machine Extensions support in Xen
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17BUILD_DEPENDS+= dev86-[0-9]*:../../devel/dev86 # needed to build firmware 17BUILD_DEPENDS+= dev86-[0-9]*:../../devel/dev86 # needed to build firmware
18 18
19PKG_SYSCONFSUBDIR= xen 19PKG_SYSCONFSUBDIR= xen
20 20
cvs diff -r1.8 -r1.9 pkgsrc/sysutils/xentools3-hvm/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools3-hvm/Attic/distinfo 2009/03/31 17:37:36 1.8
+++ pkgsrc/sysutils/xentools3-hvm/Attic/distinfo 2009/10/18 21:28:10 1.9
@@ -1,23 +1,23 @@ @@ -1,23 +1,23 @@
1$NetBSD: distinfo,v 1.8 2009/03/31 17:37:36 bouyer Exp $ 1$NetBSD: distinfo,v 1.9 2009/10/18 21:28:10 bouyer Exp $
2 2
3SHA1 (xen-3.1.4.tar.gz) = 0d784662776239195df10b3f29d40350f9d0644d 3SHA1 (xen-3.1.4.tar.gz) = 0d784662776239195df10b3f29d40350f9d0644d
4RMD160 (xen-3.1.4.tar.gz) = c02ad2bd64e6306b127a4f37a8aa370dadc11859 4RMD160 (xen-3.1.4.tar.gz) = c02ad2bd64e6306b127a4f37a8aa370dadc11859
5Size (xen-3.1.4.tar.gz) = 6894493 bytes 5Size (xen-3.1.4.tar.gz) = 6894493 bytes
6SHA1 (patch-aa) = 663c798a472501d4c38add5049faded5b7e807aa 6SHA1 (patch-aa) = 663c798a472501d4c38add5049faded5b7e807aa
7SHA1 (patch-an) = 37650fa861ed8219aa0682e84c5c8ba41a8cdff0 7SHA1 (patch-an) = 37650fa861ed8219aa0682e84c5c8ba41a8cdff0
8SHA1 (patch-ao) = 500f1921a73e3a4b7aa91bbd819a26f2327ac8b5 8SHA1 (patch-ao) = 500f1921a73e3a4b7aa91bbd819a26f2327ac8b5
9SHA1 (patch-ap) = 33f2bdbef6df3f2105d4502b8066abb6c952fc6c 9SHA1 (patch-ap) = 33f2bdbef6df3f2105d4502b8066abb6c952fc6c
10SHA1 (patch-ar) = c8748761267dd82c75deab79d13b71d56bcf2223 10SHA1 (patch-ar) = 16d551946bdbc0f712548e3dbac0913b0fcccb44
11SHA1 (patch-as) = 8850108d0c8f101642f4855184253824f9c214b5 11SHA1 (patch-as) = 8850108d0c8f101642f4855184253824f9c214b5
12SHA1 (patch-at) = 2311289176c83fcd3ff18b90bab9c2e5e05a52f1 12SHA1 (patch-at) = 2311289176c83fcd3ff18b90bab9c2e5e05a52f1
13SHA1 (patch-au) = b2357fdaff2895a5e4da4371d72ccc3041c78a83 13SHA1 (patch-au) = b2357fdaff2895a5e4da4371d72ccc3041c78a83
14SHA1 (patch-av) = be2a1440126908996410f92a04ad479f8a2ca373 14SHA1 (patch-av) = be2a1440126908996410f92a04ad479f8a2ca373
15SHA1 (patch-aw) = 2776799b391983ad79af0f28367287a4a865260a 15SHA1 (patch-aw) = 2776799b391983ad79af0f28367287a4a865260a
16SHA1 (patch-ax) = 93411fbeff95f76d723fdda993d55a2740d3a713 16SHA1 (patch-ax) = 93411fbeff95f76d723fdda993d55a2740d3a713
17SHA1 (patch-ay) = 8828bcf2286da8831f2a7c9652f168f33176c641 17SHA1 (patch-ay) = 8828bcf2286da8831f2a7c9652f168f33176c641
18SHA1 (patch-ba) = ee151472a9ec28301b67e696e81673c4bf753ed6 18SHA1 (patch-ba) = ee151472a9ec28301b67e696e81673c4bf753ed6
19SHA1 (patch-bb) = c07dfb4783694f827e0268bd780af135a800f980 19SHA1 (patch-bb) = c07dfb4783694f827e0268bd780af135a800f980
20SHA1 (patch-bv) = 2ba938aef7a5c9eb417e443577b841bae0e0550a 20SHA1 (patch-bv) = 2ba938aef7a5c9eb417e443577b841bae0e0550a
21SHA1 (patch-ck) = d085b0ced66544963441fff5231e06fd9ac03878 21SHA1 (patch-ck) = d085b0ced66544963441fff5231e06fd9ac03878
22SHA1 (patch-cl) = ad26eee7b315ec512453c73cdc29253e0fa6266f 22SHA1 (patch-cl) = ad26eee7b315ec512453c73cdc29253e0fa6266f
23SHA1 (patch-cp) = 1f774a6636ce6646fc83bab304e84ce2d8886db5 23SHA1 (patch-cp) = 1f774a6636ce6646fc83bab304e84ce2d8886db5
cvs diff -r1.1.1.1 -r1.2 pkgsrc/sysutils/xentools3-hvm/patches/Attic/patch-ar (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools3-hvm/patches/Attic/patch-ar 2007/06/14 19:42:12 1.1.1.1
+++ pkgsrc/sysutils/xentools3-hvm/patches/Attic/patch-ar 2009/10/18 21:28:10 1.2
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1$NetBSD: patch-ar,v 1.1.1.1 2007/06/14 19:42:12 bouyer Exp $ 1$NetBSD: patch-ar,v 1.2 2009/10/18 21:28:10 bouyer Exp $
2 2
3--- ioemu/vl.c.orig 2007-05-18 16:45:21.000000000 +0200 3--- ioemu/vl.c.orig 2008-04-25 15:03:12.000000000 +0200
4+++ ioemu/vl.c 2007-06-12 23:59:27.000000000 +0200 4+++ ioemu/vl.c 2009-10-18 22:22:56.000000000 +0200
5@@ -37,14 +37,17 @@ 5@@ -37,14 +37,17 @@
6 #include <sys/poll.h> 6 #include <sys/poll.h>
7 #include <sys/mman.h> 7 #include <sys/mman.h>
8 #include <sys/ioctl.h> 8 #include <sys/ioctl.h>
9+#include <sys/resource.h> 9+#include <sys/resource.h>
10 #include <sys/socket.h> 10 #include <sys/socket.h>
11 #include <netinet/in.h> 11 #include <netinet/in.h>
12+#include <net/if.h> 12+#include <net/if.h>
13+#include <net/if_tap.h> 13+#include <net/if_tap.h>
14 #include <arpa/inet.h> 14 #include <arpa/inet.h>
15 #include <dirent.h> 15 #include <dirent.h>
16 #include <netdb.h> 16 #include <netdb.h>
17 #ifdef _BSD 17 #ifdef _BSD
@@ -22,70 +22,83 @@ $NetBSD: patch-ar,v 1.1.1.1 2007/06/14 1 @@ -22,70 +22,83 @@ $NetBSD: patch-ar,v 1.1.1.1 2007/06/14 1
22 #endif 22 #endif
23 #else 23 #else
24@@ -89,8 +92,8 @@ 24@@ -89,8 +92,8 @@
25 #include "exec-all.h" 25 #include "exec-all.h"
26  26
27 #include <xen/hvm/params.h> 27 #include <xen/hvm/params.h>
28-#define DEFAULT_NETWORK_SCRIPT "/etc/xen/qemu-ifup" 28-#define DEFAULT_NETWORK_SCRIPT "/etc/xen/qemu-ifup"
29-#define DEFAULT_BRIDGE "xenbr0" 29-#define DEFAULT_BRIDGE "xenbr0"
30+#define DEFAULT_NETWORK_SCRIPT "@XENDCONFDIR@/scripts/qemu-ifup" 30+#define DEFAULT_NETWORK_SCRIPT "@XENDCONFDIR@/scripts/qemu-ifup"
31+#define DEFAULT_BRIDGE "bridge0" 31+#define DEFAULT_BRIDGE "bridge0"
32  32
33 //#define DEBUG_UNUSED_IOPORT 33 //#define DEBUG_UNUSED_IOPORT
34 //#define DEBUG_IOPORT 34 //#define DEBUG_IOPORT
35@@ -1663,7 +1666,7 @@ 35@@ -1683,7 +1686,7 @@
36 return 0; 36 return 0;
37 } 37 }
38  38
39-#if defined(__linux__) 39-#if defined(__linux__)
40+#if defined(__linux__) || defined(__NetBSD__) 40+#if defined(__linux__) || defined(__NetBSD__)
41 CharDriverState *qemu_chr_open_pty(void) 41 CharDriverState *qemu_chr_open_pty(void)
42 { 42 {
43 struct termios tty; 43 struct termios tty;
44@@ -1814,7 +1817,7 @@ 44@@ -1696,7 +1699,12 @@
 45
 46 /* Set raw attributes on the pty. */
 47 cfmakeraw(&tty);
 48+#if defined(__NetBSD__)
 49+ tcsetattr(master_fd, TCSAFLUSH, &tty);
 50+ close(slave_fd);
 51+#else
 52 tcsetattr(slave_fd, TCSAFLUSH, &tty);
 53+#endif
 54
 55 fprintf(stderr, "char device redirected to %s\n", ptsname(master_fd));
 56
 57@@ -1834,7 +1842,7 @@
45 chr->chr_ioctl = tty_serial_ioctl; 58 chr->chr_ioctl = tty_serial_ioctl;
46 return chr; 59 return chr;
47 } 60 }
48- 61-
49+#if defined(__linux__) 62+#if defined(__linux__)
50 static int pp_ioctl(CharDriverState *chr, int cmd, void *arg) 63 static int pp_ioctl(CharDriverState *chr, int cmd, void *arg)
51 { 64 {
52 int fd = (int)chr->opaque; 65 int fd = (int)chr->opaque;
53@@ -1877,13 +1880,14 @@ 66@@ -1897,13 +1905,14 @@
54 chr->chr_ioctl = pp_ioctl; 67 chr->chr_ioctl = pp_ioctl;
55 return chr; 68 return chr;
56 } 69 }
57+#endif /* __linux__ */ 70+#endif /* __linux__ */
58  71
59 #else 72 #else
60 CharDriverState *qemu_chr_open_pty(void) 73 CharDriverState *qemu_chr_open_pty(void)
61 { 74 {
62 return NULL; 75 return NULL;
63 } 76 }
64-#endif 77-#endif
65+#endif /* __linux__ || __NetBSD__ */ 78+#endif /* __linux__ || __NetBSD__ */
66  79
67 #endif /* !defined(_WIN32) */ 80 #endif /* !defined(_WIN32) */
68  81
69@@ -3126,7 +3130,7 @@ 82@@ -3146,7 +3155,7 @@
70 fclose(f); 83 fclose(f);
71 atexit(smb_exit); 84 atexit(smb_exit);
72  85
73- snprintf(smb_cmdline, sizeof(smb_cmdline), "/usr/sbin/smbd -s %s", 86- snprintf(smb_cmdline, sizeof(smb_cmdline), "/usr/sbin/smbd -s %s",
74+ snprintf(smb_cmdline, sizeof(smb_cmdline), "@PREFIX@/sbin/smbd -s %s", 87+ snprintf(smb_cmdline, sizeof(smb_cmdline), "@PREFIX@/sbin/smbd -s %s",
75 smb_conf); 88 smb_conf);
76  89
77 slirp_add_exec(0, smb_cmdline, 4, 139); 90 slirp_add_exec(0, smb_cmdline, 4, 139);
78@@ -3190,16 +3194,26 @@ 91@@ -3210,16 +3219,26 @@
79 int fd; 92 int fd;
80 char *dev; 93 char *dev;
81 struct stat s; 94 struct stat s;
82+ struct ifreq ifr; 95+ struct ifreq ifr;
83  96
84 fd = open("/dev/tap", O_RDWR); 97 fd = open("/dev/tap", O_RDWR);
85 if (fd < 0) { 98 if (fd < 0) {
86- fprintf(stderr, "warning: could not open /dev/tap: no virtual network emulation\n"); 99- fprintf(stderr, "warning: could not open /dev/tap: no virtual network emulation\n");
87+ fprintf(stderr, "warning: could not open /dev/tap: no virtual network emulation: %s\n", strerror(errno)); 100+ fprintf(stderr, "warning: could not open /dev/tap: no virtual network emulation: %s\n", strerror(errno));
88 return -1; 101 return -1;
89 } 102 }
90  103
91+#ifdef TAPGIFNAME 104+#ifdef TAPGIFNAME
@@ -93,54 +106,54 @@ $NetBSD: patch-ar,v 1.1.1.1 2007/06/14 1 @@ -93,54 +106,54 @@ $NetBSD: patch-ar,v 1.1.1.1 2007/06/14 1
93+ fprintf(stderr, "warning: could not open get tap name: %s\n", 106+ fprintf(stderr, "warning: could not open get tap name: %s\n",
94+ strerror(errno)); 107+ strerror(errno));
95+ return -1; 108+ return -1;
96+ } 109+ }
97+ pstrcpy(ifname, ifname_size, ifr.ifr_name); 110+ pstrcpy(ifname, ifname_size, ifr.ifr_name);
98+#else 111+#else
99 fstat(fd, &s); 112 fstat(fd, &s);
100 dev = devname(s.st_rdev, S_IFCHR); 113 dev = devname(s.st_rdev, S_IFCHR);
101 pstrcpy(ifname, ifname_size, dev); 114 pstrcpy(ifname, ifname_size, dev);
102+#endif 115+#endif
103  116
104 fcntl(fd, F_SETFL, O_NONBLOCK); 117 fcntl(fd, F_SETFL, O_NONBLOCK);
105 return fd; 118 return fd;
106@@ -5934,7 +5948,6 @@ 119@@ -5972,7 +5991,6 @@
107 nr_buckets = (((MAX_MCACHE_SIZE >> PAGE_SHIFT) + 120 nr_buckets = (((MAX_MCACHE_SIZE >> PAGE_SHIFT) +
108 (1UL << (MCACHE_BUCKET_SHIFT - PAGE_SHIFT)) - 1) >> 121 (1UL << (MCACHE_BUCKET_SHIFT - PAGE_SHIFT)) - 1) >>
109 (MCACHE_BUCKET_SHIFT - PAGE_SHIFT)); 122 (MCACHE_BUCKET_SHIFT - PAGE_SHIFT));
110- fprintf(logfile, "qemu_map_cache_init nr_buckets = %lx\n", nr_buckets); 123- fprintf(logfile, "qemu_map_cache_init nr_buckets = %lx\n", nr_buckets);
111  124
112 /* 125 /*
113 * Use mmap() directly: lets us allocate a big hash table with no up-front 126 * Use mmap() directly: lets us allocate a big hash table with no up-front
114@@ -5943,8 +5956,9 @@ 127@@ -5981,8 +5999,9 @@
115 */ 128 */
116 size = nr_buckets * sizeof(struct map_cache); 129 size = nr_buckets * sizeof(struct map_cache);
117 size = (size + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1); 130 size = (size + PAGE_SIZE - 1) & ~(PAGE_SIZE - 1);
118+ fprintf(logfile, "qemu_map_cache_init nr_buckets = %lx size %lu\n", nr_buckets, size); 131+ fprintf(logfile, "qemu_map_cache_init nr_buckets = %lx size %lu\n", nr_buckets, size);
119 mapcache_entry = mmap(NULL, size, PROT_READ|PROT_WRITE, 132 mapcache_entry = mmap(NULL, size, PROT_READ|PROT_WRITE,
120- MAP_SHARED|MAP_ANONYMOUS, 0, 0); 133- MAP_SHARED|MAP_ANONYMOUS, 0, 0);
121+ MAP_SHARED|MAP_ANONYMOUS, -1, 0); 134+ MAP_SHARED|MAP_ANONYMOUS, -1, 0);
122 if (mapcache_entry == MAP_FAILED) { 135 if (mapcache_entry == MAP_FAILED) {
123 errno = ENOMEM; 136 errno = ENOMEM;
124 return -1; 137 return -1;
125@@ -6081,6 +6095,7 @@ 138@@ -6119,6 +6138,7 @@
126 unsigned long ioreq_pfn; 139 unsigned long ioreq_pfn;
127 extern void *shared_page; 140 extern void *shared_page;
128 extern void *buffered_io_page; 141 extern void *buffered_io_page;
129+ struct rlimit rl; 142+ struct rlimit rl;
130 #ifdef __ia64__ 143 #ifdef __ia64__
131 unsigned long nr_pages; 144 unsigned long nr_pages;
132 xen_pfn_t *page_array; 145 xen_pfn_t *page_array;
133@@ -6089,6 +6104,32 @@ 146@@ -6127,6 +6147,32 @@
134  147
135 char qemu_dm_logfilename[64]; 148 char qemu_dm_logfilename[64];
136  149
137+ /* XXX required for now */ 150+ /* XXX required for now */
138+ if (setenv("PTHREAD_DIAGASSERT", "A", 1) != 0) 151+ if (setenv("PTHREAD_DIAGASSERT", "A", 1) != 0)
139+ perror("setenv"); 152+ perror("setenv");
140+ if (getrlimit(RLIMIT_STACK, &rl) != 0) { 153+ if (getrlimit(RLIMIT_STACK, &rl) != 0) {
141+ perror("getrlimit(RLIMIT_STACK)"); 154+ perror("getrlimit(RLIMIT_STACK)");
142+ exit(1); 155+ exit(1);
143+ } 156+ }
144+ rl.rlim_cur = rl.rlim_max; 157+ rl.rlim_cur = rl.rlim_max;
145+ if (setrlimit(RLIMIT_STACK, &rl) != 0) 158+ if (setrlimit(RLIMIT_STACK, &rl) != 0)
146+ perror("setrlimit(RLIMIT_STACK)"); 159+ perror("setrlimit(RLIMIT_STACK)");
cvs diff -r1.17 -r1.18 pkgsrc/sysutils/xentools33/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools33/Attic/distinfo 2009/08/07 12:49:21 1.17
+++ pkgsrc/sysutils/xentools33/Attic/distinfo 2009/10/18 21:28:10 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.17 2009/08/07 12:49:21 cegger Exp $ 1$NetBSD: distinfo,v 1.18 2009/10/18 21:28:10 bouyer Exp $
2 2
3SHA1 (xen-3.3.2.tar.gz) = 7f438e73ac81b25cf5e1570709e87001066bafe4 3SHA1 (xen-3.3.2.tar.gz) = 7f438e73ac81b25cf5e1570709e87001066bafe4
4RMD160 (xen-3.3.2.tar.gz) = 28faa56286f2a418e35dcba6079570ea871d6c7b 4RMD160 (xen-3.3.2.tar.gz) = 28faa56286f2a418e35dcba6079570ea871d6c7b
5Size (xen-3.3.2.tar.gz) = 11357576 bytes 5Size (xen-3.3.2.tar.gz) = 11357576 bytes
6SHA1 (patch-aa) = 74c3023e39baf488f8bae060e93f6175b32df61a 6SHA1 (patch-aa) = 74c3023e39baf488f8bae060e93f6175b32df61a
7SHA1 (patch-ab) = a6244d421dc995c9bcbc9959de422972f9d46b6d 7SHA1 (patch-ab) = a6244d421dc995c9bcbc9959de422972f9d46b6d
8SHA1 (patch-ac) = 70af1b1a787b9dad9e41a2ffe14d595c6797b4d7 8SHA1 (patch-ac) = 70af1b1a787b9dad9e41a2ffe14d595c6797b4d7
9SHA1 (patch-ad) = 323e854e5872e770580068fa93a74bd0b1531025 9SHA1 (patch-ad) = 323e854e5872e770580068fa93a74bd0b1531025
10SHA1 (patch-ae) = bb7116a71bf6637591b639511f055836a13d9887 10SHA1 (patch-ae) = bb7116a71bf6637591b639511f055836a13d9887
11SHA1 (patch-af) = 0d4cd2bc3c56934bd072bc72b34e5ed677d04969 11SHA1 (patch-af) = 0d4cd2bc3c56934bd072bc72b34e5ed677d04969
12SHA1 (patch-ag) = 6b6c26c5fbb28b9cc37e76b250cc90fed111e78a 12SHA1 (patch-ag) = 6b6c26c5fbb28b9cc37e76b250cc90fed111e78a
13SHA1 (patch-ah) = cc8d95c73d7f4a08f311e8417d26f53ffd010549 13SHA1 (patch-ah) = cc8d95c73d7f4a08f311e8417d26f53ffd010549
14SHA1 (patch-ai) = 0906a5ec3a7450fc987b01289e2560e60966d00d 14SHA1 (patch-ai) = 0906a5ec3a7450fc987b01289e2560e60966d00d
@@ -36,16 +36,16 @@ SHA1 (patch-db) = 6e9e9d0e06716990c15329 @@ -36,16 +36,16 @@ SHA1 (patch-db) = 6e9e9d0e06716990c15329
36SHA1 (patch-dc) = fdbe8e8c5f4f00b6c5212d429e830af5dc51d92b 36SHA1 (patch-dc) = fdbe8e8c5f4f00b6c5212d429e830af5dc51d92b
37SHA1 (patch-dd) = e94a0ff0c0d30f7441675f52b5f13e575f09dff8 37SHA1 (patch-dd) = e94a0ff0c0d30f7441675f52b5f13e575f09dff8
38SHA1 (patch-de) = 3e08b61cc625cfd1a4eaacbd4a325a28ce315919 38SHA1 (patch-de) = 3e08b61cc625cfd1a4eaacbd4a325a28ce315919
39SHA1 (patch-df) = 46b99d00c6562c41e5fd96df8dbcb0653c1baa46 39SHA1 (patch-df) = 46b99d00c6562c41e5fd96df8dbcb0653c1baa46
40SHA1 (patch-ea) = 4c5cd6bd798488c13a264b567a67aa7cb5f8a2e4 40SHA1 (patch-ea) = 4c5cd6bd798488c13a264b567a67aa7cb5f8a2e4
41SHA1 (patch-eb) = cf63c43ccbc6b7b435be871e392f9729bd392ab4 41SHA1 (patch-eb) = cf63c43ccbc6b7b435be871e392f9729bd392ab4
42SHA1 (patch-ec) = ec7745d92a74a7101391e07508a4ede9a72fd1d1 42SHA1 (patch-ec) = ec7745d92a74a7101391e07508a4ede9a72fd1d1
43SHA1 (patch-ed) = 613f4c4605af860e5f88b68c49a0e7870ba6ecde 43SHA1 (patch-ed) = 613f4c4605af860e5f88b68c49a0e7870ba6ecde
44SHA1 (patch-ee) = 119029fda1d4ecee90d0a108151596cb3ef0ec74 44SHA1 (patch-ee) = 119029fda1d4ecee90d0a108151596cb3ef0ec74
45SHA1 (patch-ef) = c8740b1c9cfac686f2e4e32c7613b5f02206459d 45SHA1 (patch-ef) = c8740b1c9cfac686f2e4e32c7613b5f02206459d
46SHA1 (patch-eg) = 84e816c95167828314ef901e324772249a407c41 46SHA1 (patch-eg) = 84e816c95167828314ef901e324772249a407c41
47SHA1 (patch-fa) = b4a4b7334357ebcd1646886c18c9772e8b9ae765 47SHA1 (patch-fa) = b4a4b7334357ebcd1646886c18c9772e8b9ae765
48SHA1 (patch-fb) = 22a07628566b43aa786c410927d29a283e8cf141 48SHA1 (patch-fb) = 22a07628566b43aa786c410927d29a283e8cf141
49SHA1 (patch-fc) = 37c9b0897182de93a01f9620ef6346ef68157770 49SHA1 (patch-fc) = d5afc1a1e16f26203a5615142efda8fade48b371
50SHA1 (patch-fd) = cb4741bf33050d72cfbcd2eff4a8632d976de643 50SHA1 (patch-fd) = cb4741bf33050d72cfbcd2eff4a8632d976de643
51SHA1 (patch-fe) = 85d42672766fe8ce2dc7f745938722710c6ee5a3 51SHA1 (patch-fe) = 85d42672766fe8ce2dc7f745938722710c6ee5a3
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/xentools33/patches/Attic/patch-fc (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools33/patches/Attic/patch-fc 2008/08/15 14:06:54 1.2
+++ pkgsrc/sysutils/xentools33/patches/Attic/patch-fc 2009/10/18 21:28:10 1.3
@@ -1,22 +1,35 @@ @@ -1,22 +1,35 @@
1$NetBSD: patch-fc,v 1.2 2008/08/15 14:06:54 cegger Exp $ 1$NetBSD: patch-fc,v 1.3 2009/10/18 21:28:10 bouyer Exp $
2 2
3--- ioemu/vl.c.orig 2008-08-14 15:26:06.000000000 +0000 3--- ioemu/vl.c.orig 2009-01-05 12:26:59.000000000 +0100
4+++ ioemu/vl.c 4+++ ioemu/vl.c 2009-10-18 23:08:55.000000000 +0200
5@@ -108,7 +108,7 @@ 5@@ -108,7 +108,7 @@
6  6
7 #include "exec-all.h" 7 #include "exec-all.h"
8  8
9-#define DEFAULT_NETWORK_SCRIPT "/etc/xen/qemu-ifup" 9-#define DEFAULT_NETWORK_SCRIPT "/etc/xen/qemu-ifup"
10+#define DEFAULT_NETWORK_SCRIPT "@XENDCONFDIR@/scripts/qemu-ifup" 10+#define DEFAULT_NETWORK_SCRIPT "@XENDCONFDIR@/scripts/qemu-ifup"
11 #ifdef _BSD 11 #ifdef _BSD
12 #define DEFAULT_BRIDGE "bridge0" 12 #define DEFAULT_BRIDGE "bridge0"
13 #else  13 #else
14@@ -117,7 +117,7 @@ 14@@ -117,7 +117,7 @@
15 #ifdef __sun__ 15 #ifdef __sun__
16 #define SMBD_COMMAND "/usr/sfw/sbin/smbd" 16 #define SMBD_COMMAND "/usr/sfw/sbin/smbd"
17 #else 17 #else
18-#define SMBD_COMMAND "/usr/sbin/smbd" 18-#define SMBD_COMMAND "/usr/sbin/smbd"
19+#define SMBD_COMMAND "@PREFIX@/sbin/smbd" 19+#define SMBD_COMMAND "@PREFIX@/sbin/smbd"
20 #endif 20 #endif
21  21
22 //#define DEBUG_UNUSED_IOPORT 22 //#define DEBUG_UNUSED_IOPORT
 23@@ -1914,8 +1914,11 @@
 24 }
 25
 26 /* Set raw attributes on the pty. */
 27+ if (tcgetattr(master_fd, &tty) < 0)
 28+ perror("tcgetattr");
 29 cfmakeraw(&tty);
 30- tcsetattr(slave_fd, TCSAFLUSH, &tty);
 31+ if (tcsetattr(slave_fd, TCSAFLUSH, &tty) < 0)
 32+ perror("tcsetattr");
 33
 34 fprintf(stderr, "char device redirected to %s\n", ptsname(master_fd));
 35