Don't shadow a global variable. Fixes build on netbsd-6.

Bump some of xl's timeout. 40s is too short if scripts have to be
serialised, and a domain has lots of virtual devices.
Bump PKGREVISION

4 files changed, 77 insertions, 3 deletions

diff --git a/sysutils/xentools46/Makefile b/sysutils/xentools46/Makefile
index c97e933bedc..5224d31bc55 100644
--- a/sysutils/xentools46/Makefile
+++ b/sysutils/xentools46/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.14 2017/03/20 18:44:00 bouyer Exp $
+# $NetBSD: Makefile,v 1.15 2017/03/21 22:52:52 bouyer Exp $
 #
 # VERSION is set in version.mk as it is shared with other packages
 .include		"version.mk"
 
 DISTNAME=		xen-${VERSION}
 PKGNAME=		xentools46-${VERSION}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		sysutils
 MASTER_SITES=		http://bits.xensource.com/oss-xen/release/${VERSION}/
 
diff --git a/sysutils/xentools46/distinfo b/sysutils/xentools46/distinfo
index 02bd8d5bcbd..f8e1b5273e7 100644
--- a/sysutils/xentools46/distinfo
+++ b/sysutils/xentools46/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2017/03/20 18:44:00 bouyer Exp $
+$NetBSD: distinfo,v 1.7 2017/03/21 22:52:52 bouyer Exp $
 
 SHA1 (ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz) = fecadf952821e830ce1a1d19655288eef8488f88
 RMD160 (ipxe-git-9a93db3f0947484e30e753bbd61a10b17336e20e.tar.gz) = 539bfa12db7054228250d6dd380bbf96c1a040f8
@@ -41,8 +41,10 @@ SHA1 (patch-libxl_libxl__create.c) = d4c94e9a389e9a7601513460f31c82e4f4bf28c9
 SHA1 (patch-libxl_libxl__netbsd.c) = afab3cabdc47690dcee7f8b00e2e84b9119ebcec
 SHA1 (patch-libxl_libxl__save__helper.c) = 70e5237e28bea1aa87486e080fc25aa81300a6d8
 SHA1 (patch-libxl_libxl_event.c) = d26a9372b6cc822d4a54765a04a36ce0cb004451
+SHA1 (patch-libxl_libxl_internal.h) = 73a55e5370217278dc42682d9e5b7ae541d93dc8
 SHA1 (patch-libxl_libxl_uuid.c) = d14286be8ccdbcb5fae544a1968e7b681b63e884
 SHA1 (patch-libxl_xl__cmdtable.c) = d149603cac13c996d7800cee94a9df3aaadf9625
+SHA1 (patch-libxl_xl_cmdimpl.c) = 7aea48a9761b39cf620dcad2295a257c5fc53c8c
 SHA1 (patch-ocaml_common.make) = 4d4bddca7b5d93489a3f6620af51d95bbe265abb
 SHA1 (patch-ocaml_xenstored_Makefile) = 237e26d3ec25d706e16b415f90e0fcc4913e02e5
 SHA1 (patch-ocaml_xenstored_define.ml) = 18d6878ae536554e8831f3732d2a8ea1b13a9b63
diff --git a/sysutils/xentools46/patches/patch-libxl_libxl_internal.h b/sysutils/xentools46/patches/patch-libxl_libxl_internal.h
new file mode 100644
index 00000000000..bc56a8c7132
--- /dev/null
+++ b/sysutils/xentools46/patches/patch-libxl_libxl_internal.h
@@ -0,0 +1,23 @@
+$NetBSD: patch-libxl_libxl_internal.h,v 1.1 2017/03/21 22:52:52 bouyer Exp $
+
+bump some timeouts to more reasonable values. 40s is not enough
+if there is lots of them (e.g lots of network interfaces) and they
+need to be serialized.
+
+--- libxl/libxl_internal.h.orig	2017-03-21 23:13:59.000000000 +0100
++++ libxl/libxl_internal.h	2017-03-21 23:14:47.000000000 +0100
+@@ -85,11 +85,11 @@
+ #include "_libxl_types_internal_json.h"
+ 
+ #define LIBXL_INIT_TIMEOUT 10
+-#define LIBXL_DESTROY_TIMEOUT 10
+-#define LIBXL_HOTPLUG_TIMEOUT 40
++#define LIBXL_DESTROY_TIMEOUT 120
++#define LIBXL_HOTPLUG_TIMEOUT 120
+ /* QEMU may be slow to load and start due to a bug in Linux where the I/O
+  * subsystem sometime produce high latency under load. */
+-#define LIBXL_DEVICE_MODEL_START_TIMEOUT 60
++#define LIBXL_DEVICE_MODEL_START_TIMEOUT 120
+ #define LIBXL_DEVICE_MODEL_RESTORE_FILE "/var/lib/xen/qemu-resume" /* .$domid */
+ #define LIBXL_STUBDOM_START_TIMEOUT 30
+ #define LIBXL_QEMU_BODGE_TIMEOUT 2
diff --git a/sysutils/xentools46/patches/patch-libxl_xl_cmdimpl.c b/sysutils/xentools46/patches/patch-libxl_xl_cmdimpl.c
new file mode 100644
index 00000000000..d2ae1c4a067
--- /dev/null
+++ b/sysutils/xentools46/patches/patch-libxl_xl_cmdimpl.c
@@ -0,0 +1,49 @@
+$NetBSD: patch-libxl_xl_cmdimpl.c,v 1.1 2017/03/21 22:52:52 bouyer Exp $
+avoid shadowing a global on netbsd-6.
+
+--- libxl/xl_cmdimpl.c.orig	2017-03-21 23:27:46.000000000 +0100
++++ libxl/xl_cmdimpl.c	2017-03-21 23:28:17.000000000 +0100
+@@ -473,7 +473,7 @@
+     flush_stream(fh);
+ }
+ 
+-static int do_daemonize(char *name, const char *pidfile)
++static int do_daemonize(char *name, const char *l_pidfile)
+ {
+     char *fullname;
+     pid_t child1;
+@@ -505,8 +505,8 @@
+ 
+     CHK_SYSCALL(daemon(0, 1));
+ 
+-    if (pidfile) {
+-        int fd = open(pidfile, O_RDWR | O_CREAT, S_IRUSR|S_IWUSR);
++    if (l_pidfile) {
++        int fd = open(l_pidfile, O_RDWR | O_CREAT, S_IRUSR|S_IWUSR);
+         char *pid = NULL;
+ 
+         if (fd == -1) {
+@@ -8076,7 +8076,7 @@
+ int main_devd(int argc, char **argv)
+ {
+     int ret = 0, opt = 0, daemonize = 1;
+-    const char *pidfile = NULL;
++    const char *l_pidfile = NULL;
+     static const struct option opts[] = {
+         {"pidfile", 1, 0, 'p'},
+         COMMON_LONG_OPTS,
+@@ -8088,12 +8088,12 @@
+         daemonize = 0;
+         break;
+     case 'p':
+-        pidfile = optarg;
++        l_pidfile = optarg;
+         break;
+     }
+ 
+     if (daemonize) {
+-        ret = do_daemonize("xldevd", pidfile);
++        ret = do_daemonize("xldevd", l_pidfile);
+         if (ret) {
+             ret = (ret == 1) ? 0 : ret;
+             goto out;