qemu-nvmm: add MSR_TSC

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

Module Name:	pkgsrc-wip
Committed By:	Maxime Villard <max%m00nbsd.net@localhost>
Pushed By:	maxv
Date:		Wed Apr 3 19:37:05 2019 +0200
Changeset:	442b6a0abb77d347354380154cb76c9a5ad70770

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

Log Message:
qemu-nvmm: add MSR_TSC

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

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 b88c65e73a..b26715bb92 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) = ea237f5ef60b662cacb1e23c7e186e4b32e55049
+SHA1 (patch-nvmm-support) = b45e5278ec056b622a2b92d179ae5a8a20654186
 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 10455c645c..61aac175af 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-03-21 20:52:07.633997481 +0100
-@@ -0,0 +1,1176 @@
++++ target/i386/nvmm-all.c	2019-04-03 19:14:34.639995406 +0200
+@@ -0,0 +1,1178 @@
 +/*
 + * Copyright (c) 2018-2019 Maxime Villard, All rights reserved.
 + *
@@ -555,6 +555,7 @@ Add NVMM support.
 +    state.msrs[NVMM_X64_MSR_SYSENTER_ESP] = env->sysenter_esp;
 +    state.msrs[NVMM_X64_MSR_SYSENTER_EIP] = env->sysenter_eip;
 +    state.msrs[NVMM_X64_MSR_PAT] = env->pat;
++    state.msrs[NVMM_X64_MSR_TSC] = env->tsc;
 +
 +    bitmap =
 +        NVMM_X64_STATE_SEGS |
@@ -705,6 +706,7 @@ Add NVMM support.
 +    env->sysenter_esp = state.msrs[NVMM_X64_MSR_SYSENTER_ESP];
 +    env->sysenter_eip = state.msrs[NVMM_X64_MSR_SYSENTER_EIP];
 +    env->pat = state.msrs[NVMM_X64_MSR_PAT];
++    env->tsc = state.msrs[NVMM_X64_MSR_TSC];
 +
 +    x86_update_hflags(env);
 +}