qemu-nvmm: forgot DR0

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

Module Name:	pkgsrc-wip
Committed By:	Maxime Villard <max%m00nbsd.net@localhost>
Pushed By:	maxv
Date:		Sat Apr 13 15:21:51 2019 +0200
Changeset:	d45c551a78def43aa9f7c964ea56695171090822

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

Log Message:
qemu-nvmm: forgot DR0

	  .-'---`-.
	,'          `.
	|             \
	|              \
	\           _  \
	,\  _    ,'-,/-)\
	( * \ \,' ,' ,'-)
	 `._,)     -',-')
	   \/         ''/
	    )        / /
	   /       ,'-'

Noticed by Kamil, thanks.

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

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 | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs:
diff --git a/qemu-nvmm/distinfo b/qemu-nvmm/distinfo
index 3dbe149419..9ec5cf20a5 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) = 9870f2636ae7d817bc148caf8a912fe6c5cdbe0a
+SHA1 (patch-nvmm-support) = 637d2af2c98d256fb71c8801d0984e1043f5c3c4
 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 ed91fce120..14edf65f22 100644
--- a/qemu-nvmm/patches/patch-nvmm-support
+++ b/qemu-nvmm/patches/patch-nvmm-support
@@ -376,8 +376,8 @@ 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-07 16:34:47.074878682 +0200
-@@ -0,0 +1,1165 @@
++++ target/i386/nvmm-all.c	2019-04-13 15:09:17.551898967 +0200
+@@ -0,0 +1,1167 @@
 +/*
 + * Copyright (c) 2018-2019 Maxime Villard, All rights reserved.
 + *
@@ -515,6 +515,7 @@ Add NVMM support.
 +    state.crs[NVMM_X64_CR_XCR0] = env->xcr0;
 +
 +    /* Debug registers. */
++    state.drs[NVMM_X64_DR_DR0] = env->dr[0];
 +    state.drs[NVMM_X64_DR_DR1] = env->dr[1];
 +    state.drs[NVMM_X64_DR_DR2] = env->dr[2];
 +    state.drs[NVMM_X64_DR_DR3] = env->dr[3];
@@ -667,6 +668,7 @@ Add NVMM support.
 +    env->xcr0 = state.crs[NVMM_X64_CR_XCR0];
 +
 +    /* Debug registers. */
++    env->dr[0] = state.drs[NVMM_X64_DR_DR0];
 +    env->dr[1] = state.drs[NVMM_X64_DR_DR1];
 +    env->dr[2] = state.drs[NVMM_X64_DR_DR2];
 +    env->dr[3] = state.drs[NVMM_X64_DR_DR3];