[pkgsrc/trunk]: pkgsrc/emulators/haxm haxm: Update to 0.20190301.7cb307c4e7ff...

[kamil <kamil%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/45bab31d4097
branches:  trunk
changeset: 330946:45bab31d4097
user:      kamil <kamil%pkgsrc.org@localhost>
date:      Sat Mar 09 10:57:33 2019 +0000

description:
haxm: Update to 0.20190301.7cb307c4e7ff066b51a503c76f72d7dfefc78760

Drop local patches as merged.

Compat breaking change
======================
Changed major numbers used on NetBSD.
The device nodes must be regenerated.

Upstream changelog
==================
- Improve support of NetBSD as host.
- Changes improving emulation of niche guests.

diffstat:

 emulators/haxm/Makefile                                      |   8 +--
 emulators/haxm/distinfo                                      |  12 ++---
 emulators/haxm/files/haxm-mknod                              |   6 +-
 emulators/haxm/patches/patch-platforms_netbsd_hax__entry.c   |  23 ------------
 emulators/haxm/patches/patch-platforms_netbsd_hax__wrapper.c |  23 ------------
 5 files changed, 11 insertions(+), 61 deletions(-)

diffs (116 lines):

diff -r 56cb849a3ebe -r 45bab31d4097 emulators/haxm/Makefile
--- a/emulators/haxm/Makefile   Sat Mar 09 10:05:01 2019 +0000
+++ b/emulators/haxm/Makefile   Sat Mar 09 10:57:33 2019 +0000
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2019/02/19 13:49:14 kamil Exp $
+# $NetBSD: Makefile,v 1.11 2019/03/09 10:57:33 kamil Exp $
 
 GITHUB_PROJECT=        haxm
-GITHUB_TAG=    3bdfd1a39021df9b4dfe69e05a277e4e6456494a
-DISTNAME=      haxm-1.20190214.${GITHUB_TAG}
+GITHUB_TAG=    7cb307c4e7ff066b51a503c76f72d7dfefc78760
+DISTNAME=      haxm-1.20190301.${GITHUB_TAG}
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=intel/}
 
-PKGREVISION=   2
-
 MAINTAINER=    kamil%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/intel/haxm/
 COMMENT=       Intel Hardware Accelerated Execution Manager
diff -r 56cb849a3ebe -r 45bab31d4097 emulators/haxm/distinfo
--- a/emulators/haxm/distinfo   Sat Mar 09 10:05:01 2019 +0000
+++ b/emulators/haxm/distinfo   Sat Mar 09 10:57:33 2019 +0000
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.3 2019/02/19 13:49:14 kamil Exp $
+$NetBSD: distinfo,v 1.4 2019/03/09 10:57:33 kamil Exp $
 
-SHA1 (haxm-1.20190214.3bdfd1a39021df9b4dfe69e05a277e4e6456494a-3bdfd1a39021df9b4dfe69e05a277e4e6456494a.tar.gz) = 456f8ec479838c3b55e9e789b88a0c1dabed986a
-RMD160 (haxm-1.20190214.3bdfd1a39021df9b4dfe69e05a277e4e6456494a-3bdfd1a39021df9b4dfe69e05a277e4e6456494a.tar.gz) = a2fca76a36e41f8b8f338752678211098437111d
-SHA512 (haxm-1.20190214.3bdfd1a39021df9b4dfe69e05a277e4e6456494a-3bdfd1a39021df9b4dfe69e05a277e4e6456494a.tar.gz) = 
0330862f5b85c18fd4f15f76645603ff7ad545aa872ac9ddd58bb6fb53c2b0b3895e8c9b6504370e58c724c4f2c868a684adccc85e719e07c09a3b5460c9dc0f
-Size (haxm-1.20190214.3bdfd1a39021df9b4dfe69e05a277e4e6456494a-3bdfd1a39021df9b4dfe69e05a277e4e6456494a.tar.gz) = 233258 bytes
-SHA1 (patch-platforms_netbsd_hax__entry.c) = 5bfebf21fe4720c0e01855c2830c88e940f1d4db
-SHA1 (patch-platforms_netbsd_hax__wrapper.c) = 53110b734a3be7d5b12123d9ac8e465a9492f8b2
+SHA1 (haxm-1.20190301.7cb307c4e7ff066b51a503c76f72d7dfefc78760-7cb307c4e7ff066b51a503c76f72d7dfefc78760.tar.gz) = e4bc675625eee743fbcb388ba84c09bd5db1a6fc
+RMD160 (haxm-1.20190301.7cb307c4e7ff066b51a503c76f72d7dfefc78760-7cb307c4e7ff066b51a503c76f72d7dfefc78760.tar.gz) = 31e07a40d0dd130f923e2687b8348fd5ca2f72ca
+SHA512 (haxm-1.20190301.7cb307c4e7ff066b51a503c76f72d7dfefc78760-7cb307c4e7ff066b51a503c76f72d7dfefc78760.tar.gz) = 
ad8c0128ddceb7684d772248c74794cc2dff033ab5c8a9de5697aa7cceb42e7b756fbbe0b5f4791070ac55c69ed9787bd7710602b99fbc47c7828bda41724faa
+Size (haxm-1.20190301.7cb307c4e7ff066b51a503c76f72d7dfefc78760-7cb307c4e7ff066b51a503c76f72d7dfefc78760.tar.gz) = 233969 bytes
diff -r 56cb849a3ebe -r 45bab31d4097 emulators/haxm/files/haxm-mknod
--- a/emulators/haxm/files/haxm-mknod   Sat Mar 09 10:05:01 2019 +0000
+++ b/emulators/haxm/files/haxm-mknod   Sat Mar 09 10:57:33 2019 +0000
@@ -6,10 +6,10 @@
 fi
 
 echo "*** Creating HAX devices ***"
-mknod /dev/HAX c 220 0
+mknod /dev/HAX c 348 0
 mkdir /dev/hax_vm
 for i in `seq 0 7`; do mkdir /dev/hax_vm0$i; done
-for i in `seq 0 7`; do mknod /dev/hax_vm/vm0$i c 222 $i; done
+for i in `seq 0 7`; do mknod /dev/hax_vm/vm0$i c 349 $i; done
 
 echo "*** Creating VCPU Nodes ***"
 i=0
@@ -17,7 +17,7 @@
         vm=$(echo "$i/16"|bc)
         vcpu=$(echo "$i%16"|bc)
         echo "i=$i vm=$vm vcpu=$vcpu"
-        cmd=$(printf "mknod /dev/hax_vm%02d/vcpu%02d c 221 %d" $vm $vcpu $i)
+        cmd=$(printf "mknod /dev/hax_vm%02d/vcpu%02d c 350 %d" $vm $vcpu $i)
         $cmd
         let "i+=1"
 done
diff -r 56cb849a3ebe -r 45bab31d4097 emulators/haxm/patches/patch-platforms_netbsd_hax__entry.c
--- a/emulators/haxm/patches/patch-platforms_netbsd_hax__entry.c        Sat Mar 09 10:05:01 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-platforms_netbsd_hax__entry.c,v 1.1 2019/02/19 13:49:15 kamil Exp $
-
-Correct retrieving CPU index.
-
---- platforms/netbsd/hax_entry.c.orig  2019-02-14 08:45:35.000000000 +0000
-+++ platforms/netbsd/hax_entry.c
-@@ -33,6 +33,7 @@
- #include <sys/conf.h>
- #include <sys/device.h>
- #include <sys/module.h>
-+#include <sys/cpu.h>
- 
- #include "../../core/include/config.h"
- #include "../../core/include/hax_core_interface.h"
-@@ -230,7 +231,7 @@ haxm_modcmd(modcmd_t cmd, void *arg __un
-         for (CPU_INFO_FOREACH(cii, ci)) {
-             ++max_cpus;
-             if (!ISSET(ci->ci_schedstate.spc_flags, SPCF_OFFLINE)) {
--                cpu_online_map |= __BIT(ci->ci_cpuid);
-+                cpu_online_map |= __BIT(cpu_index(ci));
-             }
-         }
- 
diff -r 56cb849a3ebe -r 45bab31d4097 emulators/haxm/patches/patch-platforms_netbsd_hax__wrapper.c
--- a/emulators/haxm/patches/patch-platforms_netbsd_hax__wrapper.c      Sat Mar 09 10:05:01 2019 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-$NetBSD: patch-platforms_netbsd_hax__wrapper.c,v 1.1 2019/02/19 13:49:15 kamil Exp $
-
-Correct retrieving CPU index.
-
---- platforms/netbsd/hax_wrapper.c.orig        2019-02-14 08:45:35.000000000 +0000
-+++ platforms/netbsd/hax_wrapper.c
-@@ -35,6 +35,7 @@
- #include <sys/mutex.h>
- #include <sys/systm.h>
- #include <sys/xcall.h>
-+#include <sys/cpu.h>
- #include <machine/cpu.h>
- #include <machine/cpufunc.h>
- 
-@@ -61,7 +62,7 @@ int hax_log_level(int level, const char 
- 
- uint32_t hax_cpuid(void)
- {
--    return curcpu()->ci_cpuid;
-+    return cpu_index(curcpu());
- }
- 
- typedef struct smp_call_parameter {