qemu: Update NVMM patchset to v4

Address build warnings.

3 files changed, 12 insertions, 7 deletions

diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index b0c9491e584..a54d92f0d39 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.228 2020/02/06 16:46:43 kamil Exp $
+# $NetBSD: Makefile,v 1.229 2020/02/06 21:42:29 kamil Exp $
 
 DISTNAME=	qemu-4.2.0
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	emulators
 MASTER_SITES=	https://download.qemu.org/
 EXTRACT_SUFX=	.tar.xz
diff --git a/emulators/qemu/distinfo b/emulators/qemu/distinfo
index 3849bebac16..7719c139e82 100644
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.154 2020/02/06 16:46:17 kamil Exp $
+$NetBSD: distinfo,v 1.155 2020/02/06 21:42:29 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__image.sh) = e4c452062f40569e33aa93eec4a65bd
 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) = 4b6d29456d3ad6409ce0cd83ef95d2226a7aab33
+SHA1 (patch-target_i386_nvmm-all.c) = adf857c12e746604ca2aa49caf5dde17e5207325
 SHA1 (patch-util_drm.c) = b30a46d623d9431c5af2f3cd101adb89be3f0c2b
diff --git a/emulators/qemu/patches/patch-target_i386_nvmm-all.c b/emulators/qemu/patches/patch-target_i386_nvmm-all.c
index bf0653bbb99..4c4050352b7 100644
--- a/emulators/qemu/patches/patch-target_i386_nvmm-all.c
+++ b/emulators/qemu/patches/patch-target_i386_nvmm-all.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-target_i386_nvmm-all.c,v 1.1 2020/02/06 16:46:17 kamil Exp $
+$NetBSD: patch-target_i386_nvmm-all.c,v 1.2 2020/02/06 21:42:29 kamil Exp $
 
 Add NVMM support.
 
---- target/i386/nvmm-all.c.orig	2020-02-06 16:25:13.969936459 +0000
+--- target/i386/nvmm-all.c.orig	2020-02-06 21:37:53.532213438 +0000
 +++ target/i386/nvmm-all.c
-@@ -0,0 +1,1221 @@
+@@ -0,0 +1,1226 @@
 +/*
 + * Copyright (c) 2018-2019 Maxime Villard, All rights reserved.
 + *
@@ -22,6 +22,7 @@ Add NVMM support.
 +#include "strings.h"
 +#include "sysemu/accel.h"
 +#include "sysemu/nvmm.h"
++#include "sysemu/runstate.h"
 +#include "sysemu/sysemu.h"
 +#include "sysemu/cpus.h"
 +#include "qemu/main-loop.h"
@@ -110,6 +111,7 @@ Add NVMM support.
 +    state->gprs[NVMM_X64_GPR_RBP] = env->regs[R_EBP];
 +    state->gprs[NVMM_X64_GPR_RSI] = env->regs[R_ESI];
 +    state->gprs[NVMM_X64_GPR_RDI] = env->regs[R_EDI];
++#ifdef TARGET_X86_64
 +    state->gprs[NVMM_X64_GPR_R8]  = env->regs[R_R8];
 +    state->gprs[NVMM_X64_GPR_R9]  = env->regs[R_R9];
 +    state->gprs[NVMM_X64_GPR_R10] = env->regs[R_R10];
@@ -118,6 +120,7 @@ Add NVMM support.
 +    state->gprs[NVMM_X64_GPR_R13] = env->regs[R_R13];
 +    state->gprs[NVMM_X64_GPR_R14] = env->regs[R_R14];
 +    state->gprs[NVMM_X64_GPR_R15] = env->regs[R_R15];
++#endif
 +
 +    /* RIP and RFLAGS. */
 +    state->gprs[NVMM_X64_GPR_RIP] = env->eip;
@@ -260,6 +263,7 @@ Add NVMM support.
 +    env->regs[R_EBP] = state->gprs[NVMM_X64_GPR_RBP];
 +    env->regs[R_ESI] = state->gprs[NVMM_X64_GPR_RSI];
 +    env->regs[R_EDI] = state->gprs[NVMM_X64_GPR_RDI];
++#ifdef TARGET_X86_64
 +    env->regs[R_R8]  = state->gprs[NVMM_X64_GPR_R8];
 +    env->regs[R_R9]  = state->gprs[NVMM_X64_GPR_R9];
 +    env->regs[R_R10] = state->gprs[NVMM_X64_GPR_R10];
@@ -268,6 +272,7 @@ Add NVMM support.
 +    env->regs[R_R13] = state->gprs[NVMM_X64_GPR_R13];
 +    env->regs[R_R14] = state->gprs[NVMM_X64_GPR_R14];
 +    env->regs[R_R15] = state->gprs[NVMM_X64_GPR_R15];
++#endif
 +
 +    /* RIP and RFLAGS. */
 +    env->eip = state->gprs[NVMM_X64_GPR_RIP];