CVS commit: pkgsrc/emulators/haxm

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Tue Feb 19 13:49:15 UTC 2019

Modified Files:
        pkgsrc/emulators/haxm: Makefile distinfo
Added Files:
        pkgsrc/emulators/haxm/patches: patch-platforms_netbsd_hax__entry.c
            patch-platforms_netbsd_hax__wrapper.c

Log Message:
haxm: Correct retrieving CPU index

Bump PKGREVISION.

Issue reported by <gson>
Patch and testing by <gson>


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/emulators/haxm/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/emulators/haxm/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/haxm/patches/patch-platforms_netbsd_hax__entry.c \
    pkgsrc/emulators/haxm/patches/patch-platforms_netbsd_hax__wrapper.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/haxm/Makefile
diff -u pkgsrc/emulators/haxm/Makefile:1.9 pkgsrc/emulators/haxm/Makefile:1.10
--- pkgsrc/emulators/haxm/Makefile:1.9  Mon Feb 18 01:34:12 2019
+++ pkgsrc/emulators/haxm/Makefile      Tue Feb 19 13:49:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2019/02/18 01:34:12 kamil Exp $
+# $NetBSD: Makefile,v 1.10 2019/02/19 13:49:14 kamil Exp $
 
 GITHUB_PROJECT=        haxm
 GITHUB_TAG=    3bdfd1a39021df9b4dfe69e05a277e4e6456494a
@@ -6,7 +6,7 @@ DISTNAME=       haxm-1.20190214.${GITHUB_TAG}
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=intel/}
 
-PKGREVISION=   1
+PKGREVISION=   2
 
 MAINTAINER=    kamil%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/intel/haxm/

Index: pkgsrc/emulators/haxm/distinfo
diff -u pkgsrc/emulators/haxm/distinfo:1.2 pkgsrc/emulators/haxm/distinfo:1.3
--- pkgsrc/emulators/haxm/distinfo:1.2  Thu Feb 14 23:17:55 2019
+++ pkgsrc/emulators/haxm/distinfo      Tue Feb 19 13:49:14 2019
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.2 2019/02/14 23:17:55 kamil Exp $
+$NetBSD: distinfo,v 1.3 2019/02/19 13:49:14 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

Added files:

Index: pkgsrc/emulators/haxm/patches/patch-platforms_netbsd_hax__entry.c
diff -u /dev/null pkgsrc/emulators/haxm/patches/patch-platforms_netbsd_hax__entry.c:1.1
--- /dev/null   Tue Feb 19 13:49:15 2019
+++ pkgsrc/emulators/haxm/patches/patch-platforms_netbsd_hax__entry.c   Tue Feb 19 13:49:15 2019
@@ -0,0 +1,23 @@
+$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));
+             }
+         }
+ 
Index: pkgsrc/emulators/haxm/patches/patch-platforms_netbsd_hax__wrapper.c
diff -u /dev/null pkgsrc/emulators/haxm/patches/patch-platforms_netbsd_hax__wrapper.c:1.1
--- /dev/null   Tue Feb 19 13:49:15 2019
+++ pkgsrc/emulators/haxm/patches/patch-platforms_netbsd_hax__wrapper.c Tue Feb 19 13:49:15 2019
@@ -0,0 +1,23 @@
+$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 {