qemu-nvmm: hide X2APIC, and while here MCA too

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

Module Name:	pkgsrc-wip
Committed By:	Maxime Villard <max%m00nbsd.net@localhost>
Pushed By:	maxv
Date:		Wed Feb 13 17:16:40 2019 +0100
Changeset:	187ca5b586fb15591bec02041989613644e6793b

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

Log Message:
qemu-nvmm: hide X2APIC, and while here MCA too

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

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, 4 insertions(+), 4 deletions(-)

diffs:
diff --git a/qemu-nvmm/distinfo b/qemu-nvmm/distinfo
index 459e65b6e8..2aa2ddd4e7 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) = 788b054cbdb232e1f6df087f222ea6b56a9d5e31
+SHA1 (patch-nvmm-support) = 431113468befb2cd4d8fb60499a83495b5d9a60a
 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 013f0d6e23..380b309b54 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-02-04 12:02:48.551127655 +0100
++++ target/i386/nvmm-all.c	2019-02-13 15:57:30.270110128 +0100
 @@ -0,0 +1,1173 @@
 +/*
 + * Copyright (c) 2018-2019 Maxime Villard, All rights reserved.
@@ -1459,8 +1459,8 @@ Add NVMM support.
 +    /* Delete the Monitor and MTRR bits, set the Hypervisor bit. */
 +    memset(&cpuid, 0, sizeof(cpuid));
 +    cpuid.leaf = 0x00000001;
-+    cpuid.del.ecx = CPUID_EXT_MONITOR;
-+    cpuid.del.edx = CPUID_MCE | CPUID_MTRR;
++    cpuid.del.ecx = CPUID_EXT_MONITOR | CPUID_EXT_X2APIC;
++    cpuid.del.edx = CPUID_MCE | CPUID_MCA | CPUID_MTRR;
 +    cpuid.set.ecx = CPUID_EXT_HYPERVISOR;
 +
 +    ret = nvmm_machine_configure(mach, NVMM_X86_CONF_CPUID, &cpuid);