CVS commit: pkgsrc/emulators/qemu

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

Module Name:    pkgsrc
Committed By:   kamil
Date:           Thu Feb  6 23:23:21 UTC 2020

Modified Files:
        pkgsrc/emulators/qemu: Makefile distinfo
        pkgsrc/emulators/qemu/patches: patch-target_i386_nvmm-all.c

Log Message:
qemu: Fix qemu-system-i386 nvmm warning


To generate a diff of this commit:
cvs rdiff -u -r1.230 -r1.231 pkgsrc/emulators/qemu/Makefile
cvs rdiff -u -r1.155 -r1.156 pkgsrc/emulators/qemu/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm-all.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/qemu/Makefile
diff -u pkgsrc/emulators/qemu/Makefile:1.230 pkgsrc/emulators/qemu/Makefile:1.231
--- pkgsrc/emulators/qemu/Makefile:1.230        Thu Feb  6 22:01:37 2020
+++ pkgsrc/emulators/qemu/Makefile      Thu Feb  6 23:23:21 2020
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.230 2020/02/06 22:01:37 kamil Exp $
+# $NetBSD: Makefile,v 1.231 2020/02/06 23:23:21 kamil Exp $
 
 DISTNAME=      qemu-4.2.0
-PKGREVISION=   7
+PKGREVISION=   8
 CATEGORIES=    emulators
 MASTER_SITES=  https://download.qemu.org/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/emulators/qemu/distinfo
diff -u pkgsrc/emulators/qemu/distinfo:1.155 pkgsrc/emulators/qemu/distinfo:1.156
--- pkgsrc/emulators/qemu/distinfo:1.155        Thu Feb  6 21:42:29 2020
+++ pkgsrc/emulators/qemu/distinfo      Thu Feb  6 23:23:21 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.155 2020/02/06 21:42:29 kamil Exp $
+$NetBSD: distinfo,v 1.156 2020/02/06 23:23:21 kamil Exp $
 
 SHA1 (qemu-4.2.0.tar.xz) = b27aa828a8457bd8551ae3c81b80cc365e1f6bfe
 RMD160 (qemu-4.2.0.tar.xz) = cab8f6d85c0c6e9c01059087ed27d1243a7004a4
@@ -29,5 +29,5 @@ SHA1 (patch-roms_u-boot_tools_imx8m__ima
 SHA1 (patch-target_i386_Makefile.objs) = be8ab2e72521ccd0a71db6b37feb9957b27ac970
 SHA1 (patch-target_i386_helper.c) = 54363fe53688ea4030665b3bbb3ee7aba7ba5348
 SHA1 (patch-target_i386_kvm-stub.c) = 4cd2b7a8d8d8a317829f982b5acff7fdf2479d9f
-SHA1 (patch-target_i386_nvmm-all.c) = adf857c12e746604ca2aa49caf5dde17e5207325
+SHA1 (patch-target_i386_nvmm-all.c) = 091c56c88c2366abef907ca99e5bfa9933a2b6ab
 SHA1 (patch-util_drm.c) = b30a46d623d9431c5af2f3cd101adb89be3f0c2b

Index: pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm-all.c
diff -u pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm-all.c:1.2 pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm-all.c:1.3
--- pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm-all.c:1.2      Thu Feb  6 21:42:29 2020
+++ pkgsrc/emulators/qemu/patches/patch-target_i386_nvmm-all.c  Thu Feb  6 23:23:21 2020
@@ -1,8 +1,8 @@
-$NetBSD: patch-target_i386_nvmm-all.c,v 1.2 2020/02/06 21:42:29 kamil Exp $
+$NetBSD: patch-target_i386_nvmm-all.c,v 1.3 2020/02/06 23:23:21 kamil Exp $
 
 Add NVMM support.
 
---- target/i386/nvmm-all.c.orig        2020-02-06 21:37:53.532213438 +0000
+--- target/i386/nvmm-all.c.orig        2020-02-06 23:03:06.140694264 +0000
 +++ target/i386/nvmm-all.c
 @@ -0,0 +1,1226 @@
 +/*
@@ -170,7 +170,7 @@ Add NVMM support.
 +    state->fpu.fx_mxcsr_mask = 0x0000FFFF;
 +    assert(sizeof(state->fpu.fx_87_ac) == sizeof(env->fpregs));
 +    memcpy(state->fpu.fx_87_ac, env->fpregs, sizeof(env->fpregs));
-+    for (i = 0; i < 16; i++) {
++    for (i = 0; i < CPU_NB_REGS; i++) {
 +        memcpy(&state->fpu.fx_xmm[i].xmm_bytes[0],
 +            &env->xmm_regs[i].ZMM_Q(0), 8);
 +        memcpy(&state->fpu.fx_xmm[i].xmm_bytes[8],
@@ -325,7 +325,7 @@ Add NVMM support.
 +    env->mxcsr = state->fpu.fx_mxcsr;
 +    assert(sizeof(state->fpu.fx_87_ac) == sizeof(env->fpregs));
 +    memcpy(env->fpregs, state->fpu.fx_87_ac, sizeof(env->fpregs));
-+    for (i = 0; i < 16; i++) {
++    for (i = 0; i < CPU_NB_REGS; i++) {
 +        memcpy(&env->xmm_regs[i].ZMM_Q(0),
 +            &state->fpu.fx_xmm[i].xmm_bytes[0], 8);
 +        memcpy(&env->xmm_regs[i].ZMM_Q(1),