qemu-nvmm: update

[Maxime Villard <max%m00nbsd.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Maxime Villard <max%m00nbsd.net@localhost>
Pushed By:	maxv
Date:		Sat Apr 6 13:50:59 2019 +0200
Changeset:	d0df8ab2d4021dff9133d24acc48d7abbb8f6da9

Modified Files:
	qemu-nvmm/distinfo
	qemu-nvmm/patches/patch-nvmm-support

Log Message:
qemu-nvmm: update

Sync with the latest libnvmm.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d0df8ab2d4021dff9133d24acc48d7abbb8f6da9

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

diffstat:
 qemu-nvmm/distinfo                   |  2 +-
 qemu-nvmm/patches/patch-nvmm-support | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs:
diff --git a/qemu-nvmm/distinfo b/qemu-nvmm/distinfo
index b26715bb92..526778f9f6 100644
--- a/qemu-nvmm/distinfo
+++ b/qemu-nvmm/distinfo
@@ -16,7 +16,7 @@ SHA1 (patch-hw_display_omap__dss.c) = 6b13242f28e32346bc70548c216c578d98fd3420
 SHA1 (patch-hw_net_etraxfs__eth.c) = e5dd1661d60dbcd27b332403e0843500ba9544bc
 SHA1 (patch-hw_net_xilinx__axienet.c) = ebcd2676d64ce6f31e4a8c976d4fdf530ad5e8b7
 SHA1 (patch-hw_usb_dev-mtp.c) = 66543b5559d92f8e2fa9a6eb85e5dfe7c1ad3339
-SHA1 (patch-nvmm-support) = b45e5278ec056b622a2b92d179ae5a8a20654186
+SHA1 (patch-nvmm-support) = e563de960d598dde0dc505a9135006b263857155
 SHA1 (patch-target_arm_cpu.h) = 0f70a35900c7cc3124dc11969643e0eef6ad6af5
 SHA1 (patch-target_arm_helper.c) = 08f9425422080442a2c90bb252423bab38651ae4
 SHA1 (patch-tests_Makefile.include) = 42345d697cb2e324dccf1d68bd8d61e8001c6162
diff --git a/qemu-nvmm/patches/patch-nvmm-support b/qemu-nvmm/patches/patch-nvmm-support
index 61aac175af..9574574d7d 100644
--- a/qemu-nvmm/patches/patch-nvmm-support
+++ b/qemu-nvmm/patches/patch-nvmm-support
@@ -376,7 +376,7 @@ Add NVMM support.
  obj-$(CONFIG_SEV) += sev.o
  obj-$(call lnot,$(CONFIG_SEV)) += sev-stub.o
 --- target/i386/nvmm-all.c	1970-01-01 01:00:00.000000000 +0100
-+++ target/i386/nvmm-all.c	2019-04-03 19:14:34.639995406 +0200
++++ target/i386/nvmm-all.c	2019-04-06 13:33:27.806991190 +0200
 @@ -0,0 +1,1178 @@
 +/*
 + * Copyright (c) 2018-2019 Maxime Villard, All rights reserved.
@@ -417,7 +417,7 @@ Add NVMM support.
 +    bool int_window_exit;
 +    bool nmi_window_exit;
 +
-+    /* The guest is an interrupt shadow (POP SS, etc). */
++    /* The guest is in an interrupt shadow (POP SS, etc). */
 +    bool int_shadow;
 +};
 +
@@ -727,10 +727,10 @@ Add NVMM support.
 +
 +        /* Exit on interrupt window. */
 +        nvmm_vcpu_getstate(mach, vcpu->cpuid, &state,
-+            NVMM_X64_STATE_MISC);
-+        state.misc[NVMM_X64_MISC_INT_WINDOW_EXIT] = 1;
++            NVMM_X64_STATE_INTR);
++        state.intr.int_window_exiting = 1;
 +        nvmm_vcpu_setstate(mach, vcpu->cpuid, &state,
-+            NVMM_X64_STATE_MISC);
++            NVMM_X64_STATE_INTR);
 +
 +        return false;
 +    }