From nobody Fri Dec 19 20:14:42 2025
Delivered-To: importer@patchew.org
Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied
 by domain of lists.libvirt.org) client-ip=8.43.85.245;
 envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org;
Authentication-Results: mx.zohomail.com;
	spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain
 of lists.libvirt.org)  smtp.mailfrom=devel-bounces@lists.libvirt.org;
	dmarc=fail(p=none dis=none)  header.from=redhat.com
Return-Path: <devel-bounces@lists.libvirt.org>
Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by
 mx.zohomail.com
	with SMTPS id 1699314215099781.8412306743479;
 Mon, 6 Nov 2023 15:43:35 -0800 (PST)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id 610C81AD2; Mon,  6 Nov 2023 18:43:33 -0500 (EST)
Received: from lists.libvirt.org (localhost [IPv6:::1])
	by lists.libvirt.org (Postfix) with ESMTP id 008A71A55;
	Mon,  6 Nov 2023 17:24:16 -0500 (EST)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id AB18019B5; Mon,  6 Nov 2023 17:21:57 -0500 (EST)
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.133.124])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by lists.libvirt.org (Postfix) with ESMTPS id 1A26C19D9
	for <devel@lists.libvirt.org>; Mon,  6 Nov 2023 17:21:34 -0500 (EST)
Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com
 [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id
 us-mta-382-4JW4E7-ONL6pZXrZDiedEQ-1; Mon, 06 Nov 2023 17:21:30 -0500
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com
 [10.11.54.5])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest
 SHA256)
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2188B85A58B
	for <devel@lists.libvirt.org>; Mon,  6 Nov 2023 22:21:30 +0000 (UTC)
Received: from himantopus.redhat.com (unknown [10.2.18.3])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id E5E04502B
	for <devel@lists.libvirt.org>; Mon,  6 Nov 2023 22:21:29 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org
X-Spam-Level: 
X-Spam-Status: No,
 score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,
	MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,
	RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE
	autolearn=unavailable autolearn_force=no version=3.4.4
X-MC-Unique: 4JW4E7-ONL6pZXrZDiedEQ-1
From: Jonathon Jongsma <jjongsma@redhat.com>
To: devel@lists.libvirt.org
Subject: [libvirt PATCH 19/19] NOMERGE: RFC: regenerate all cpu definitions
Date: Mon,  6 Nov 2023 16:21:24 -0600
Message-ID: <20231106222124.3675713-20-jjongsma@redhat.com>
In-Reply-To: <20231106222124.3675713-1-jjongsma@redhat.com>
References: <20231106222124.3675713-1-jjongsma@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.5
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Message-ID-Hash: 3MQHURBQBDJEQV54G2522XAN7QQOJPMA
X-Message-ID-Hash: 3MQHURBQBDJEQV54G2522XAN7QQOJPMA
X-MailFrom: jjongsma@redhat.com
X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency;
 loop; banned-address; member-moderation; header-match-config-1;
 header-match-config-2; header-match-config-3;
 header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia;
 implicit-dest; max-recipients; max-size; news-moderation; no-subject;
 suspicious-header
X-Mailman-Version: 3.2.2
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <devel.lists.libvirt.org>
Archived-At: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/3MQHURBQBDJEQV54G2522XAN7QQOJPMA/>
List-Archive: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/>
List-Help: <mailto:devel-request@lists.libvirt.org?subject=help>
List-Post: <mailto:devel@lists.libvirt.org>
List-Subscribe: <mailto:devel-join@lists.libvirt.org>
List-Unsubscribe: <mailto:devel-leave@lists.libvirt.org>
Content-Type: text/plain; charset="utf-8"; x-default="true"
Content-Transfer-Encoding: quoted-printable
X-ZM-MESSAGEID: 1699314216310100001

This is just for discussion. I used the
src/cpu_map/sync_qemu_models_i386.py script and regenerated the CPU
model definitions from the current qemu master source code. I then
regenerated all test output to see what the result would be. I am not
suggesting that this is a viable approach, but... Are there some updates
that should happen here?
---
 src/cpu_map/x86_Broadwell-IBRS.xml            | 18 ++++++++++++++----
 src/cpu_map/x86_Broadwell-noTSX-IBRS.xml      | 18 ++++++++++++++----
 src/cpu_map/x86_Broadwell-noTSX.xml           | 18 ++++++++++++++----
 src/cpu_map/x86_Broadwell.xml                 | 17 +++++++++++++----
 src/cpu_map/x86_Cascadelake-Server-noTSX.xml  | 18 +++++++++++++++---
 src/cpu_map/x86_Cascadelake-Server.xml        | 10 ++++++++--
 src/cpu_map/x86_Cooperlake.xml                |  8 +++++++-
 src/cpu_map/x86_Dhyana.xml                    | 12 ++++++++++--
 src/cpu_map/x86_EPYC-Genoa.xml                |  7 +++++++
 src/cpu_map/x86_EPYC-IBPB.xml                 | 11 +++++++++--
 src/cpu_map/x86_EPYC-Milan.xml                |  7 +++++++
 src/cpu_map/x86_EPYC-Rome.xml                 |  7 +++++++
 src/cpu_map/x86_EPYC.xml                      | 10 ++++++++--
 src/cpu_map/x86_Haswell-IBRS.xml              | 19 +++++++++++++++----
 src/cpu_map/x86_Haswell-noTSX-IBRS.xml        | 19 +++++++++++++++----
 src/cpu_map/x86_Haswell-noTSX.xml             | 19 +++++++++++++++----
 src/cpu_map/x86_Haswell.xml                   | 17 +++++++++++++----
 src/cpu_map/x86_Icelake-Server-noTSX.xml      | 13 +++++++++----
 src/cpu_map/x86_Icelake-Server.xml            | 10 +++++++---
 src/cpu_map/x86_IvyBridge-IBRS.xml            | 12 ++++++++++--
 src/cpu_map/x86_IvyBridge.xml                 | 11 +++++++++--
 src/cpu_map/x86_Nehalem-IBRS.xml              | 13 +++++++++----
 src/cpu_map/x86_Nehalem.xml                   | 12 ++++++++----
 src/cpu_map/x86_SandyBridge-IBRS.xml          | 13 +++++++++++--
 src/cpu_map/x86_SandyBridge.xml               | 12 ++++++++++--
 src/cpu_map/x86_SapphireRapids.xml            |  6 ++++++
 src/cpu_map/x86_Skylake-Client-IBRS.xml       | 15 ++++++++-------
 src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml | 17 +++++++++--------
 src/cpu_map/x86_Skylake-Client.xml            | 14 +++++++-------
 src/cpu_map/x86_Skylake-Server-IBRS.xml       | 11 +++++++++--
 src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml | 13 ++++++++++---
 src/cpu_map/x86_Skylake-Server.xml            | 11 +++++++++--
 src/cpu_map/x86_Snowridge.xml                 |  9 ++++++++-
 src/cpu_map/x86_Westmere-IBRS.xml             | 12 +++++++++++-
 src/cpu_map/x86_Westmere.xml                  | 13 ++++++++++---
 ...4-baseline-Westmere+Nehalem-migratable.xml |  4 ++--
 ...86_64-baseline-Westmere+Nehalem-result.xml |  4 ++--
 .../x86_64-baseline-features-expanded.xml     |  1 +
 .../x86_64-baseline-features-result.xml       |  2 --
 .../x86_64-baseline-simple-expanded.xml       |  3 +++
 .../x86_64-cpuid-Atom-P5362-host.xml          |  3 ---
 .../x86_64-cpuid-Core-i5-2500-guest.xml       |  3 ---
 .../x86_64-cpuid-Core-i5-2500-host.xml        |  3 ---
 .../x86_64-cpuid-Core-i5-2500-json.xml        |  3 ---
 .../x86_64-cpuid-Core-i5-2540M-guest.xml      |  3 ---
 .../x86_64-cpuid-Core-i5-2540M-host.xml       |  3 ---
 .../x86_64-cpuid-Core-i5-2540M-json.xml       |  3 ---
 .../x86_64-cpuid-Core-i5-4670T-guest.xml      |  6 +-----
 .../x86_64-cpuid-Core-i5-4670T-host.xml       | 19 ++++++++++++++++---
 .../x86_64-cpuid-Core-i5-4670T-json.xml       |  6 +-----
 .../x86_64-cpuid-Core-i5-650-guest.xml        |  3 ---
 .../x86_64-cpuid-Core-i5-650-host.xml         |  3 ---
 .../x86_64-cpuid-Core-i5-650-json.xml         |  3 ---
 .../x86_64-cpuid-Core-i5-6600-guest.xml       |  1 +
 .../x86_64-cpuid-Core-i5-6600-host.xml        |  1 +
 .../x86_64-cpuid-Core-i5-6600-json.xml        |  1 +
 .../x86_64-cpuid-Core-i7-2600-guest.xml       |  3 ---
 .../x86_64-cpuid-Core-i7-2600-host.xml        |  3 ---
 .../x86_64-cpuid-Core-i7-2600-json.xml        |  3 ---
 ...6_64-cpuid-Core-i7-2600-xsaveopt-guest.xml |  2 --
 ...86_64-cpuid-Core-i7-2600-xsaveopt-host.xml |  9 ++++++---
 ...86_64-cpuid-Core-i7-2600-xsaveopt-json.xml |  2 --
 .../x86_64-cpuid-Core-i7-3520M-guest.xml      |  2 --
 .../x86_64-cpuid-Core-i7-3520M-host.xml       |  2 --
 .../x86_64-cpuid-Core-i7-3740QM-guest.xml     |  2 +-
 .../x86_64-cpuid-Core-i7-3740QM-host.xml      | 13 +++++++++++--
 .../x86_64-cpuid-Core-i7-3740QM-json.xml      |  2 +-
 .../x86_64-cpuid-Core-i7-3770-guest.xml       |  2 --
 .../x86_64-cpuid-Core-i7-3770-host.xml        |  2 --
 .../x86_64-cpuid-Core-i7-3770-json.xml        |  2 +-
 .../x86_64-cpuid-Core-i7-4510U-guest.xml      |  6 ------
 .../x86_64-cpuid-Core-i7-4510U-host.xml       |  3 ---
 .../x86_64-cpuid-Core-i7-4510U-json.xml       |  6 ------
 .../x86_64-cpuid-Core-i7-4600U-guest.xml      |  6 ------
 .../x86_64-cpuid-Core-i7-4600U-host.xml       |  6 ------
 .../x86_64-cpuid-Core-i7-4600U-json.xml       |  6 ------
 .../x86_64-cpuid-Core-i7-5600U-arat-guest.xml |  6 ------
 .../x86_64-cpuid-Core-i7-5600U-arat-host.xml  |  6 ------
 .../x86_64-cpuid-Core-i7-5600U-arat-json.xml  |  6 +-----
 .../x86_64-cpuid-Core-i7-5600U-guest.xml      |  6 ------
 .../x86_64-cpuid-Core-i7-5600U-host.xml       |  6 ------
 .../x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml |  6 ------
 .../x86_64-cpuid-Core-i7-5600U-ibrs-host.xml  |  6 ------
 .../x86_64-cpuid-Core-i7-5600U-ibrs-json.xml  |  6 ------
 .../x86_64-cpuid-Core-i7-5600U-json.xml       |  6 ------
 .../x86_64-cpuid-Core-i7-7600U-guest.xml      |  1 +
 .../x86_64-cpuid-Core-i7-7600U-host.xml       |  1 +
 .../x86_64-cpuid-Core-i7-7600U-json.xml       |  1 +
 .../x86_64-cpuid-Core-i7-7700-guest.xml       |  1 +
 .../x86_64-cpuid-Core-i7-7700-host.xml        |  1 +
 .../x86_64-cpuid-Core-i7-7700-json.xml        |  1 +
 .../x86_64-cpuid-Core-i7-8550U-guest.xml      |  5 ++---
 .../x86_64-cpuid-Core-i7-8550U-host.xml       |  4 ++--
 .../x86_64-cpuid-Core-i7-8550U-json.xml       |  5 ++---
 .../x86_64-cpuid-Core-i7-8700-guest.xml       |  1 +
 .../x86_64-cpuid-Core-i7-8700-host.xml        |  1 +
 .../x86_64-cpuid-Core-i7-8700-json.xml        |  1 +
 ...6_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml |  1 -
 .../x86_64-cpuid-EPYC-7601-32-Core-json.xml   |  1 -
 ...6_64-cpuid-Hygon-C86-7185-32-core-json.xml |  3 +--
 .../x86_64-cpuid-Ice-Lake-Server-guest.xml    |  1 +
 .../x86_64-cpuid-Ice-Lake-Server-host.xml     |  1 +
 .../x86_64-cpuid-Ice-Lake-Server-json.xml     |  2 +-
 .../x86_64-cpuid-Pentium-P6100-guest.xml      | 10 ++++------
 ...64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml |  1 -
 .../x86_64-cpuid-Xeon-E3-1225-v5-guest.xml    |  1 +
 .../x86_64-cpuid-Xeon-E3-1225-v5-host.xml     |  1 +
 .../x86_64-cpuid-Xeon-E3-1225-v5-json.xml     |  1 +
 .../x86_64-cpuid-Xeon-E3-1245-v5-guest.xml    |  1 +
 .../x86_64-cpuid-Xeon-E3-1245-v5-host.xml     |  1 +
 .../x86_64-cpuid-Xeon-E3-1245-v5-json.xml     |  1 +
 .../x86_64-cpuid-Xeon-E5-2609-v3-guest.xml    |  6 ------
 .../x86_64-cpuid-Xeon-E5-2609-v3-host.xml     |  6 ------
 .../x86_64-cpuid-Xeon-E5-2609-v3-json.xml     |  6 ------
 .../x86_64-cpuid-Xeon-E5-2623-v4-guest.xml    |  6 ------
 .../x86_64-cpuid-Xeon-E5-2623-v4-host.xml     |  6 ------
 .../x86_64-cpuid-Xeon-E5-2623-v4-json.xml     |  6 ------
 .../x86_64-cpuid-Xeon-E5-2630-v3-guest.xml    |  6 ------
 .../x86_64-cpuid-Xeon-E5-2630-v3-host.xml     |  6 ------
 .../x86_64-cpuid-Xeon-E5-2630-v3-json.xml     |  6 +-----
 .../x86_64-cpuid-Xeon-E5-2630-v4-guest.xml    |  6 ------
 .../x86_64-cpuid-Xeon-E5-2630-v4-host.xml     |  6 ------
 .../x86_64-cpuid-Xeon-E5-2630-v4-json.xml     |  6 ------
 .../x86_64-cpuid-Xeon-E5-2650-guest.xml       |  3 ---
 .../x86_64-cpuid-Xeon-E5-2650-host.xml        |  3 ---
 .../x86_64-cpuid-Xeon-E5-2650-json.xml        |  3 ---
 .../x86_64-cpuid-Xeon-E5-2650-v3-guest.xml    |  6 ------
 .../x86_64-cpuid-Xeon-E5-2650-v3-host.xml     |  6 ------
 .../x86_64-cpuid-Xeon-E5-2650-v3-json.xml     |  6 ++----
 .../x86_64-cpuid-Xeon-E5-2650-v4-guest.xml    |  6 ------
 .../x86_64-cpuid-Xeon-E5-2650-v4-host.xml     |  6 ------
 .../x86_64-cpuid-Xeon-E5-2650-v4-json.xml     |  6 ------
 .../x86_64-cpuid-Xeon-E7-4820-guest.xml       |  3 ---
 .../x86_64-cpuid-Xeon-E7-4820-host.xml        |  3 ---
 .../x86_64-cpuid-Xeon-E7-4820-json.xml        |  4 ++--
 .../x86_64-cpuid-Xeon-E7-4830-guest.xml       |  3 ---
 .../x86_64-cpuid-Xeon-E7-4830-host.xml        |  3 ---
 .../x86_64-cpuid-Xeon-E7-4830-json.xml        |  3 ---
 .../x86_64-cpuid-Xeon-E7-8890-v3-guest.xml    |  6 ------
 .../x86_64-cpuid-Xeon-E7-8890-v3-host.xml     |  6 ------
 .../x86_64-cpuid-Xeon-E7-8890-v3-json.xml     |  6 ------
 .../x86_64-cpuid-Xeon-E7540-guest.xml         |  1 -
 .../x86_64-cpuid-Xeon-E7540-host.xml          |  1 -
 .../x86_64-cpuid-Xeon-E7540-json.xml          |  1 -
 .../x86_64-cpuid-Xeon-Gold-5115-guest.xml     |  2 +-
 .../x86_64-cpuid-Xeon-Gold-5115-host.xml      |  2 +-
 .../x86_64-cpuid-Xeon-Gold-5115-json.xml      |  2 ++
 .../x86_64-cpuid-Xeon-Gold-6130-guest.xml     |  2 +-
 .../x86_64-cpuid-Xeon-Gold-6130-host.xml      |  2 +-
 .../x86_64-cpuid-Xeon-Gold-6130-json.xml      |  2 +-
 .../x86_64-cpuid-Xeon-Gold-6148-guest.xml     |  3 +--
 .../x86_64-cpuid-Xeon-Gold-6148-host.xml      |  3 +--
 .../x86_64-cpuid-Xeon-Gold-6148-json.xml      |  3 ++-
 .../x86_64-cpuid-Xeon-Platinum-8268-json.xml  |  2 +-
 .../x86_64-cpuid-Xeon-W3520-guest.xml         |  1 -
 .../x86_64-cpuid-Xeon-W3520-host.xml          |  1 -
 .../x86_64-cpuid-Xeon-W3520-json.xml          |  1 -
 ...id-baseline-Broadwell-IBRS+Cascadelake.xml |  6 ------
 ...puid-baseline-Cascadelake+Skylake-IBRS.xml |  2 +-
 ..._64-cpuid-baseline-Cascadelake+Skylake.xml |  3 ++-
 .../x86_64-cpuid-baseline-EPYC+Rome.xml       |  1 -
 .../x86_64-cpuid-baseline-Haswell+Skylake.xml |  6 ------
 ...-baseline-Haswell-noTSX-IBRS+Broadwell.xml |  6 ------
 ...seline-Haswell-noTSX-IBRS+Skylake-IBRS.xml |  6 ------
 ...id-baseline-Haswell-noTSX-IBRS+Skylake.xml |  6 ------
 .../x86_64-cpuid-baseline-Ryzen+Rome.xml      |  1 -
 ...4-cpuid-baseline-Skylake-Client+Server.xml |  1 +
 .../domaincapsdata/qemu_4.2.0-q35.x86_64.xml  |  1 +
 tests/domaincapsdata/qemu_4.2.0.x86_64.xml    |  1 +
 .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml  |  1 +
 tests/domaincapsdata/qemu_5.0.0.x86_64.xml    |  1 +
 ...-Icelake-Server-pconfig.x86_64-latest.args |  2 +-
 .../cpu-host-model.x86_64-4.2.0.args          |  2 +-
 .../cpu-host-model.x86_64-5.0.0.args          |  2 +-
 174 files changed, 458 insertions(+), 488 deletions(-)

diff --git a/src/cpu_map/x86_Broadwell-IBRS.xml b/src/cpu_map/x86_Broadwell=
-IBRS.xml
index e54233dfa9..d9c4757001 100644
--- a/src/cpu_map/x86_Broadwell-IBRS.xml
+++ b/src/cpu_map/x86_Broadwell-IBRS.xml
@@ -1,16 +1,22 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '2'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Core Processor (Broadwell)'
+  'property.model-id': 'Intel Core Processor (Broadwell, IBRS)'
+-->
 <cpus>
   <model name=3D'Broadwell-IBRS'>
     <alias name=3D'Broadwell-v3'/>
     <decode host=3D'on' guest=3D'on'/>
-    <signature family=3D'6' model=3D'61'/> <!-- 0306d0 -->
-    <signature family=3D'6' model=3D'71'/> <!-- 040670 -->
-    <signature family=3D'6' model=3D'79'/> <!-- 0406f0 -->
-    <signature family=3D'6' model=3D'86'/> <!-- 050660 -->
+    <signature family=3D'6' model=3D'61'/>
     <vendor name=3D'Intel'/>
     <feature name=3D'3dnowprefetch'/>
+    <feature name=3D'abm'/>
     <feature name=3D'adx'/>
     <feature name=3D'aes'/>
     <feature name=3D'apic'/>
+    <feature name=3D'arat'/>
     <feature name=3D'avx'/>
     <feature name=3D'avx2'/>
     <feature name=3D'bmi1'/>
@@ -21,6 +27,7 @@
     <feature name=3D'cx8'/>
     <feature name=3D'de'/>
     <feature name=3D'erms'/>
+    <feature name=3D'f16c'/>
     <feature name=3D'fma'/>
     <feature name=3D'fpu'/>
     <feature name=3D'fsgsbase'/>
@@ -45,6 +52,7 @@
     <feature name=3D'popcnt'/>
     <feature name=3D'pse'/>
     <feature name=3D'pse36'/>
+    <feature name=3D'rdrand'/>
     <feature name=3D'rdseed'/>
     <feature name=3D'rdtscp'/>
     <feature name=3D'rtm'/>
@@ -60,7 +68,9 @@
     <feature name=3D'syscall'/>
     <feature name=3D'tsc'/>
     <feature name=3D'tsc-deadline'/>
+    <feature name=3D'vme'/>
     <feature name=3D'x2apic'/>
     <feature name=3D'xsave'/>
+    <feature name=3D'xsaveopt'/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml b/src/cpu_map/x86_Bro=
adwell-noTSX-IBRS.xml
index 637fb7a2cb..d15b321b88 100644
--- a/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
@@ -1,16 +1,22 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '2'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Core Processor (Broadwell)'
+  'property.model-id': 'Intel Core Processor (Broadwell, no TSX, IBRS)'
+-->
 <cpus>
   <model name=3D'Broadwell-noTSX-IBRS'>
     <alias name=3D'Broadwell-v4'/>
     <decode host=3D'on' guest=3D'on'/>
-    <signature family=3D'6' model=3D'61'/> <!-- 0306d0 -->
-    <signature family=3D'6' model=3D'71'/> <!-- 040670 -->
-    <signature family=3D'6' model=3D'79'/> <!-- 0406f0 -->
-    <signature family=3D'6' model=3D'86'/> <!-- 050660 -->
+    <signature family=3D'6' model=3D'61'/>
     <vendor name=3D'Intel'/>
     <feature name=3D'3dnowprefetch'/>
+    <feature name=3D'abm'/>
     <feature name=3D'adx'/>
     <feature name=3D'aes'/>
     <feature name=3D'apic'/>
+    <feature name=3D'arat'/>
     <feature name=3D'avx'/>
     <feature name=3D'avx2'/>
     <feature name=3D'bmi1'/>
@@ -21,6 +27,7 @@
     <feature name=3D'cx8'/>
     <feature name=3D'de'/>
     <feature name=3D'erms'/>
+    <feature name=3D'f16c'/>
     <feature name=3D'fma'/>
     <feature name=3D'fpu'/>
     <feature name=3D'fsgsbase'/>
@@ -44,6 +51,7 @@
     <feature name=3D'popcnt'/>
     <feature name=3D'pse'/>
     <feature name=3D'pse36'/>
+    <feature name=3D'rdrand'/>
     <feature name=3D'rdseed'/>
     <feature name=3D'rdtscp'/>
     <feature name=3D'sep'/>
@@ -58,7 +66,9 @@
     <feature name=3D'syscall'/>
     <feature name=3D'tsc'/>
     <feature name=3D'tsc-deadline'/>
+    <feature name=3D'vme'/>
     <feature name=3D'x2apic'/>
     <feature name=3D'xsave'/>
+    <feature name=3D'xsaveopt'/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Broadwell-noTSX.xml b/src/cpu_map/x86_Broadwel=
l-noTSX.xml
index 4d70fcacb2..b2a947ec8e 100644
--- a/src/cpu_map/x86_Broadwell-noTSX.xml
+++ b/src/cpu_map/x86_Broadwell-noTSX.xml
@@ -1,16 +1,22 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '2'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Core Processor (Broadwell)'
+  'property.model-id': 'Intel Core Processor (Broadwell, no TSX)'
+-->
 <cpus>
   <model name=3D'Broadwell-noTSX'>
     <alias name=3D'Broadwell-v2'/>
     <decode host=3D'on' guest=3D'on'/>
-    <signature family=3D'6' model=3D'61'/> <!-- 0306d0 -->
-    <signature family=3D'6' model=3D'71'/> <!-- 040670 -->
-    <signature family=3D'6' model=3D'79'/> <!-- 0406f0 -->
-    <signature family=3D'6' model=3D'86'/> <!-- 050660 -->
+    <signature family=3D'6' model=3D'61'/>
     <vendor name=3D'Intel'/>
     <feature name=3D'3dnowprefetch'/>
+    <feature name=3D'abm'/>
     <feature name=3D'adx'/>
     <feature name=3D'aes'/>
     <feature name=3D'apic'/>
+    <feature name=3D'arat'/>
     <feature name=3D'avx'/>
     <feature name=3D'avx2'/>
     <feature name=3D'bmi1'/>
@@ -21,6 +27,7 @@
     <feature name=3D'cx8'/>
     <feature name=3D'de'/>
     <feature name=3D'erms'/>
+    <feature name=3D'f16c'/>
     <feature name=3D'fma'/>
     <feature name=3D'fpu'/>
     <feature name=3D'fsgsbase'/>
@@ -44,6 +51,7 @@
     <feature name=3D'popcnt'/>
     <feature name=3D'pse'/>
     <feature name=3D'pse36'/>
+    <feature name=3D'rdrand'/>
     <feature name=3D'rdseed'/>
     <feature name=3D'rdtscp'/>
     <feature name=3D'sep'/>
@@ -57,7 +65,9 @@
     <feature name=3D'syscall'/>
     <feature name=3D'tsc'/>
     <feature name=3D'tsc-deadline'/>
+    <feature name=3D'vme'/>
     <feature name=3D'x2apic'/>
     <feature name=3D'xsave'/>
+    <feature name=3D'xsaveopt'/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Broadwell.xml b/src/cpu_map/x86_Broadwell.xml
index c638418d27..36e263fdf2 100644
--- a/src/cpu_map/x86_Broadwell.xml
+++ b/src/cpu_map/x86_Broadwell.xml
@@ -1,16 +1,21 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '2'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Core Processor (Broadwell)'
+-->
 <cpus>
   <model name=3D'Broadwell'>
     <alias name=3D'Broadwell-v1'/>
     <decode host=3D'on' guest=3D'on'/>
-    <signature family=3D'6' model=3D'61'/> <!-- 0306d0 -->
-    <signature family=3D'6' model=3D'71'/> <!-- 040670 -->
-    <signature family=3D'6' model=3D'79'/> <!-- 0406f0 -->
-    <signature family=3D'6' model=3D'86'/> <!-- 050660 -->
+    <signature family=3D'6' model=3D'61'/>
     <vendor name=3D'Intel'/>
     <feature name=3D'3dnowprefetch'/>
+    <feature name=3D'abm'/>
     <feature name=3D'adx'/>
     <feature name=3D'aes'/>
     <feature name=3D'apic'/>
+    <feature name=3D'arat'/>
     <feature name=3D'avx'/>
     <feature name=3D'avx2'/>
     <feature name=3D'bmi1'/>
@@ -21,6 +26,7 @@
     <feature name=3D'cx8'/>
     <feature name=3D'de'/>
     <feature name=3D'erms'/>
+    <feature name=3D'f16c'/>
     <feature name=3D'fma'/>
     <feature name=3D'fpu'/>
     <feature name=3D'fsgsbase'/>
@@ -45,6 +51,7 @@
     <feature name=3D'popcnt'/>
     <feature name=3D'pse'/>
     <feature name=3D'pse36'/>
+    <feature name=3D'rdrand'/>
     <feature name=3D'rdseed'/>
     <feature name=3D'rdtscp'/>
     <feature name=3D'rtm'/>
@@ -59,7 +66,9 @@
     <feature name=3D'syscall'/>
     <feature name=3D'tsc'/>
     <feature name=3D'tsc-deadline'/>
+    <feature name=3D'vme'/>
     <feature name=3D'x2apic'/>
     <feature name=3D'xsave'/>
+    <feature name=3D'xsaveopt'/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Cascadelake-Server-noTSX.xml b/src/cpu_map/x86=
_Cascadelake-Server-noTSX.xml
index 3ddd4e9947..2296f20336 100644
--- a/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
+++ b/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
@@ -1,8 +1,15 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '6'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Xeon Processor (Cascadelake)'
+  'version.note': 'ARCH_CAPABILITIES, no TSX'
+-->
 <cpus>
   <model name=3D'Cascadelake-Server-noTSX'>
     <alias name=3D'Cascadelake-Server-v3'/>
-    <decode host=3D'on' guest=3D'off'/>
-    <signature family=3D'6' model=3D'85' stepping=3D'5-7'/> <!-- 050654 -->
+    <decode host=3D'on' guest=3D'on'/>
+    <signature family=3D'6' model=3D'85'/>
     <vendor name=3D'Intel'/>
     <feature name=3D'3dnowprefetch'/>
     <feature name=3D'abm'/>
@@ -10,6 +17,7 @@
     <feature name=3D'aes'/>
     <feature name=3D'apic'/>
     <feature name=3D'arat'/>
+    <feature name=3D'arch-capabilities'/>
     <feature name=3D'avx'/>
     <feature name=3D'avx2'/>
     <feature name=3D'avx512bw'/>
@@ -33,14 +41,15 @@
     <feature name=3D'fpu'/>
     <feature name=3D'fsgsbase'/>
     <feature name=3D'fxsr'/>
+    <feature name=3D'ibrs-all'/>
     <feature name=3D'invpcid'/>
     <feature name=3D'lahf_lm'/>
     <feature name=3D'lm'/>
     <feature name=3D'mca'/>
     <feature name=3D'mce'/>
+    <feature name=3D'mds-no'/>
     <feature name=3D'mmx'/>
     <feature name=3D'movbe'/>
-    <feature name=3D'mpx'/>
     <feature name=3D'msr'/>
     <feature name=3D'mtrr'/>
     <feature name=3D'nx'/>
@@ -50,14 +59,17 @@
     <feature name=3D'pclmuldq'/>
     <feature name=3D'pdpe1gb'/>
     <feature name=3D'pge'/>
+    <feature name=3D'pku'/>
     <feature name=3D'pni'/>
     <feature name=3D'popcnt'/>
     <feature name=3D'pse'/>
     <feature name=3D'pse36'/>
+    <feature name=3D'rdctl-no'/>
     <feature name=3D'rdrand'/>
     <feature name=3D'rdseed'/>
     <feature name=3D'rdtscp'/>
     <feature name=3D'sep'/>
+    <feature name=3D'skip-l1dfl-vmentry'/>
     <feature name=3D'smap'/>
     <feature name=3D'smep'/>
     <feature name=3D'spec-ctrl'/>
diff --git a/src/cpu_map/x86_Cascadelake-Server.xml b/src/cpu_map/x86_Casca=
delake-Server.xml
index 3805ce9d59..1e0c53d54e 100644
--- a/src/cpu_map/x86_Cascadelake-Server.xml
+++ b/src/cpu_map/x86_Cascadelake-Server.xml
@@ -1,8 +1,14 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '6'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Xeon Processor (Cascadelake)'
+-->
 <cpus>
   <model name=3D'Cascadelake-Server'>
     <alias name=3D'Cascadelake-Server-v1'/>
     <decode host=3D'on' guest=3D'on'/>
-    <signature family=3D'6' model=3D'85' stepping=3D'5-7'/> <!-- 050654 -->
+    <signature family=3D'6' model=3D'85'/>
     <vendor name=3D'Intel'/>
     <feature name=3D'3dnowprefetch'/>
     <feature name=3D'abm'/>
@@ -41,7 +47,6 @@
     <feature name=3D'mce'/>
     <feature name=3D'mmx'/>
     <feature name=3D'movbe'/>
-    <feature name=3D'mpx'/>
     <feature name=3D'msr'/>
     <feature name=3D'mtrr'/>
     <feature name=3D'nx'/>
@@ -51,6 +56,7 @@
     <feature name=3D'pclmuldq'/>
     <feature name=3D'pdpe1gb'/>
     <feature name=3D'pge'/>
+    <feature name=3D'pku'/>
     <feature name=3D'pni'/>
     <feature name=3D'popcnt'/>
     <feature name=3D'pse'/>
diff --git a/src/cpu_map/x86_Cooperlake.xml b/src/cpu_map/x86_Cooperlake.xml
index 2e879f8121..d3148c6079 100644
--- a/src/cpu_map/x86_Cooperlake.xml
+++ b/src/cpu_map/x86_Cooperlake.xml
@@ -1,8 +1,14 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '10'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Xeon Processor (Cooperlake)'
+-->
 <cpus>
   <model name=3D'Cooperlake'>
     <alias name=3D'Cooperlake-v1'/>
     <decode host=3D'on' guest=3D'on'/>
-    <signature family=3D'6' model=3D'85' stepping=3D'10-11'/> <!-- 05065b =
-->
+    <signature family=3D'6' model=3D'85'/>
     <vendor name=3D'Intel'/>
     <feature name=3D'3dnowprefetch'/>
     <feature name=3D'abm'/>
diff --git a/src/cpu_map/x86_Dhyana.xml b/src/cpu_map/x86_Dhyana.xml
index 54aac1be3a..82e6061dd0 100644
--- a/src/cpu_map/x86_Dhyana.xml
+++ b/src/cpu_map/x86_Dhyana.xml
@@ -1,8 +1,15 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '1'
+  'model.xlevel': '0x8000001E'
+  'model.model_id': 'Hygon Dhyana Processor'
+  'model.cache_info': '&epyc_cache_info'
+-->
 <cpus>
   <model name=3D'Dhyana'>
     <alias name=3D'Dhyana-v1'/>
     <decode host=3D'on' guest=3D'on'/>
-    <signature family=3D'24' model=3D'0'/> <!-- 900f00 -->
+    <signature family=3D'24' model=3D'0'/>
     <vendor name=3D'Hygon'/>
     <feature name=3D'3dnowprefetch'/>
     <feature name=3D'abm'/>
@@ -34,10 +41,11 @@
     <feature name=3D'misalignsse'/>
     <feature name=3D'mmx'/>
     <feature name=3D'mmxext'/>
-    <feature name=3D'monitor' removed=3D'yes'/>
     <feature name=3D'movbe'/>
     <feature name=3D'msr'/>
     <feature name=3D'mtrr'/>
+    <feature name=3D'npt'/>
+    <feature name=3D'nrip-save'/>
     <feature name=3D'nx'/>
     <feature name=3D'osvw'/>
     <feature name=3D'pae'/>
diff --git a/src/cpu_map/x86_EPYC-Genoa.xml b/src/cpu_map/x86_EPYC-Genoa.xml
index 3e765b89b1..c79b99250f 100644
--- a/src/cpu_map/x86_EPYC-Genoa.xml
+++ b/src/cpu_map/x86_EPYC-Genoa.xml
@@ -1,3 +1,10 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '0'
+  'model.xlevel': '0x80000022'
+  'model.model_id': 'AMD EPYC-Genoa Processor'
+  'model.cache_info': '&epyc_genoa_cache_info'
+-->
 <cpus>
   <model name=3D'EPYC-Genoa'>
     <decode host=3D'on' guest=3D'on'/>
diff --git a/src/cpu_map/x86_EPYC-IBPB.xml b/src/cpu_map/x86_EPYC-IBPB.xml
index f93dc29213..4b64834979 100644
--- a/src/cpu_map/x86_EPYC-IBPB.xml
+++ b/src/cpu_map/x86_EPYC-IBPB.xml
@@ -1,8 +1,16 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '2'
+  'model.xlevel': '0x8000001E'
+  'model.model_id': 'AMD EPYC Processor'
+  'model.cache_info': '&epyc_cache_info'
+  'property.model-id': 'AMD EPYC Processor (with IBPB)'
+-->
 <cpus>
   <model name=3D'EPYC-IBPB'>
     <alias name=3D'EPYC-v2'/>
     <decode host=3D'on' guest=3D'on'/>
-    <signature family=3D'23' model=3D'1'/> <!-- 800f10 -->
+    <signature family=3D'23' model=3D'1'/>
     <vendor name=3D'AMD'/>
     <feature name=3D'3dnowprefetch'/>
     <feature name=3D'abm'/>
@@ -35,7 +43,6 @@
     <feature name=3D'misalignsse'/>
     <feature name=3D'mmx'/>
     <feature name=3D'mmxext'/>
-    <feature name=3D'monitor' removed=3D'yes'/>
     <feature name=3D'movbe'/>
     <feature name=3D'msr'/>
     <feature name=3D'mtrr'/>
diff --git a/src/cpu_map/x86_EPYC-Milan.xml b/src/cpu_map/x86_EPYC-Milan.xml
index 5163469256..036203ccfe 100644
--- a/src/cpu_map/x86_EPYC-Milan.xml
+++ b/src/cpu_map/x86_EPYC-Milan.xml
@@ -1,3 +1,10 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '1'
+  'model.xlevel': '0x8000001E'
+  'model.model_id': 'AMD EPYC-Milan Processor'
+  'model.cache_info': '&epyc_milan_cache_info'
+-->
 <cpus>
   <model name=3D'EPYC-Milan'>
     <alias name=3D'EPYC-Milan-v1'/>
diff --git a/src/cpu_map/x86_EPYC-Rome.xml b/src/cpu_map/x86_EPYC-Rome.xml
index 7b42442a1e..f90ff65401 100644
--- a/src/cpu_map/x86_EPYC-Rome.xml
+++ b/src/cpu_map/x86_EPYC-Rome.xml
@@ -1,3 +1,10 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '0'
+  'model.xlevel': '0x8000001E'
+  'model.model_id': 'AMD EPYC-Rome Processor'
+  'model.cache_info': '&epyc_rome_cache_info'
+-->
 <cpus>
   <model name=3D'EPYC-Rome'>
     <alias name=3D'EPYC-Rome-v1'/>
diff --git a/src/cpu_map/x86_EPYC.xml b/src/cpu_map/x86_EPYC.xml
index 38096fce1c..8317ad8fc7 100644
--- a/src/cpu_map/x86_EPYC.xml
+++ b/src/cpu_map/x86_EPYC.xml
@@ -1,8 +1,15 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '2'
+  'model.xlevel': '0x8000001E'
+  'model.model_id': 'AMD EPYC Processor'
+  'model.cache_info': '&epyc_cache_info'
+-->
 <cpus>
   <model name=3D'EPYC'>
     <alias name=3D'EPYC-v1'/>
     <decode host=3D'on' guest=3D'on'/>
-    <signature family=3D'23' model=3D'1'/> <!-- 800f10 -->
+    <signature family=3D'23' model=3D'1'/>
     <vendor name=3D'AMD'/>
     <feature name=3D'3dnowprefetch'/>
     <feature name=3D'abm'/>
@@ -34,7 +41,6 @@
     <feature name=3D'misalignsse'/>
     <feature name=3D'mmx'/>
     <feature name=3D'mmxext'/>
-    <feature name=3D'monitor' removed=3D'yes'/>
     <feature name=3D'movbe'/>
     <feature name=3D'msr'/>
     <feature name=3D'mtrr'/>
diff --git a/src/cpu_map/x86_Haswell-IBRS.xml b/src/cpu_map/x86_Haswell-IBR=
S.xml
index 10ab7e2032..ee476bc3a2 100644
--- a/src/cpu_map/x86_Haswell-IBRS.xml
+++ b/src/cpu_map/x86_Haswell-IBRS.xml
@@ -1,14 +1,21 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '4'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Core Processor (Haswell)'
+  'property.stepping': '4'
+  'property.model-id': 'Intel Core Processor (Haswell, IBRS)'
+-->
 <cpus>
   <model name=3D'Haswell-IBRS'>
     <alias name=3D'Haswell-v3'/>
     <decode host=3D'on' guest=3D'on'/>
-    <signature family=3D'6' model=3D'60'/> <!-- 0306c0 -->
-    <signature family=3D'6' model=3D'63'/> <!-- 0306f0 -->
-    <signature family=3D'6' model=3D'69'/> <!-- 040650 -->
-    <signature family=3D'6' model=3D'70'/> <!-- 040660 -->
+    <signature family=3D'6' model=3D'60'/>
     <vendor name=3D'Intel'/>
+    <feature name=3D'abm'/>
     <feature name=3D'aes'/>
     <feature name=3D'apic'/>
+    <feature name=3D'arat'/>
     <feature name=3D'avx'/>
     <feature name=3D'avx2'/>
     <feature name=3D'bmi1'/>
@@ -19,6 +26,7 @@
     <feature name=3D'cx8'/>
     <feature name=3D'de'/>
     <feature name=3D'erms'/>
+    <feature name=3D'f16c'/>
     <feature name=3D'fma'/>
     <feature name=3D'fpu'/>
     <feature name=3D'fsgsbase'/>
@@ -43,6 +51,7 @@
     <feature name=3D'popcnt'/>
     <feature name=3D'pse'/>
     <feature name=3D'pse36'/>
+    <feature name=3D'rdrand'/>
     <feature name=3D'rdtscp'/>
     <feature name=3D'rtm'/>
     <feature name=3D'sep'/>
@@ -56,7 +65,9 @@
     <feature name=3D'syscall'/>
     <feature name=3D'tsc'/>
     <feature name=3D'tsc-deadline'/>
+    <feature name=3D'vme'/>
     <feature name=3D'x2apic'/>
     <feature name=3D'xsave'/>
+    <feature name=3D'xsaveopt'/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Haswell-noTSX-IBRS.xml b/src/cpu_map/x86_Haswe=
ll-noTSX-IBRS.xml
index 23bf427df8..42ae1da41a 100644
--- a/src/cpu_map/x86_Haswell-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Haswell-noTSX-IBRS.xml
@@ -1,14 +1,21 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '4'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Core Processor (Haswell)'
+  'property.stepping': '1'
+  'property.model-id': 'Intel Core Processor (Haswell, no TSX, IBRS)'
+-->
 <cpus>
   <model name=3D'Haswell-noTSX-IBRS'>
     <alias name=3D'Haswell-v4'/>
     <decode host=3D'on' guest=3D'on'/>
-    <signature family=3D'6' model=3D'60'/> <!-- 0306c0 -->
-    <signature family=3D'6' model=3D'63'/> <!-- 0306f0 -->
-    <signature family=3D'6' model=3D'69'/> <!-- 040650 -->
-    <signature family=3D'6' model=3D'70'/> <!-- 040660 -->
+    <signature family=3D'6' model=3D'60'/>
     <vendor name=3D'Intel'/>
+    <feature name=3D'abm'/>
     <feature name=3D'aes'/>
     <feature name=3D'apic'/>
+    <feature name=3D'arat'/>
     <feature name=3D'avx'/>
     <feature name=3D'avx2'/>
     <feature name=3D'bmi1'/>
@@ -19,6 +26,7 @@
     <feature name=3D'cx8'/>
     <feature name=3D'de'/>
     <feature name=3D'erms'/>
+    <feature name=3D'f16c'/>
     <feature name=3D'fma'/>
     <feature name=3D'fpu'/>
     <feature name=3D'fsgsbase'/>
@@ -42,6 +50,7 @@
     <feature name=3D'popcnt'/>
     <feature name=3D'pse'/>
     <feature name=3D'pse36'/>
+    <feature name=3D'rdrand'/>
     <feature name=3D'rdtscp'/>
     <feature name=3D'sep'/>
     <feature name=3D'smep'/>
@@ -54,7 +63,9 @@
     <feature name=3D'syscall'/>
     <feature name=3D'tsc'/>
     <feature name=3D'tsc-deadline'/>
+    <feature name=3D'vme'/>
     <feature name=3D'x2apic'/>
     <feature name=3D'xsave'/>
+    <feature name=3D'xsaveopt'/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Haswell-noTSX.xml b/src/cpu_map/x86_Haswell-no=
TSX.xml
index eec6d046a0..fca9e6fda3 100644
--- a/src/cpu_map/x86_Haswell-noTSX.xml
+++ b/src/cpu_map/x86_Haswell-noTSX.xml
@@ -1,14 +1,21 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '4'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Core Processor (Haswell)'
+  'property.stepping': '1'
+  'property.model-id': 'Intel Core Processor (Haswell, no TSX)'
+-->
 <cpus>
   <model name=3D'Haswell-noTSX'>
     <alias name=3D'Haswell-v2'/>
     <decode host=3D'on' guest=3D'on'/>
-    <signature family=3D'6' model=3D'60'/> <!-- 0306c0 -->
-    <signature family=3D'6' model=3D'63'/> <!-- 0306f0 -->
-    <signature family=3D'6' model=3D'69'/> <!-- 040650 -->
-    <signature family=3D'6' model=3D'70'/> <!-- 040660 -->
+    <signature family=3D'6' model=3D'60'/>
     <vendor name=3D'Intel'/>
+    <feature name=3D'abm'/>
     <feature name=3D'aes'/>
     <feature name=3D'apic'/>
+    <feature name=3D'arat'/>
     <feature name=3D'avx'/>
     <feature name=3D'avx2'/>
     <feature name=3D'bmi1'/>
@@ -19,6 +26,7 @@
     <feature name=3D'cx8'/>
     <feature name=3D'de'/>
     <feature name=3D'erms'/>
+    <feature name=3D'f16c'/>
     <feature name=3D'fma'/>
     <feature name=3D'fpu'/>
     <feature name=3D'fsgsbase'/>
@@ -42,6 +50,7 @@
     <feature name=3D'popcnt'/>
     <feature name=3D'pse'/>
     <feature name=3D'pse36'/>
+    <feature name=3D'rdrand'/>
     <feature name=3D'rdtscp'/>
     <feature name=3D'sep'/>
     <feature name=3D'smep'/>
@@ -53,7 +62,9 @@
     <feature name=3D'syscall'/>
     <feature name=3D'tsc'/>
     <feature name=3D'tsc-deadline'/>
+    <feature name=3D'vme'/>
     <feature name=3D'x2apic'/>
     <feature name=3D'xsave'/>
+    <feature name=3D'xsaveopt'/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Haswell.xml b/src/cpu_map/x86_Haswell.xml
index c3ec40ce19..916580c440 100644
--- a/src/cpu_map/x86_Haswell.xml
+++ b/src/cpu_map/x86_Haswell.xml
@@ -1,14 +1,19 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '4'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Core Processor (Haswell)'
+-->
 <cpus>
   <model name=3D'Haswell'>
     <alias name=3D'Haswell-v1'/>
     <decode host=3D'on' guest=3D'on'/>
-    <signature family=3D'6' model=3D'60'/> <!-- 0306c0 -->
-    <signature family=3D'6' model=3D'63'/> <!-- 0306f0 -->
-    <signature family=3D'6' model=3D'69'/> <!-- 040650 -->
-    <signature family=3D'6' model=3D'70'/> <!-- 040660 -->
+    <signature family=3D'6' model=3D'60'/>
     <vendor name=3D'Intel'/>
+    <feature name=3D'abm'/>
     <feature name=3D'aes'/>
     <feature name=3D'apic'/>
+    <feature name=3D'arat'/>
     <feature name=3D'avx'/>
     <feature name=3D'avx2'/>
     <feature name=3D'bmi1'/>
@@ -19,6 +24,7 @@
     <feature name=3D'cx8'/>
     <feature name=3D'de'/>
     <feature name=3D'erms'/>
+    <feature name=3D'f16c'/>
     <feature name=3D'fma'/>
     <feature name=3D'fpu'/>
     <feature name=3D'fsgsbase'/>
@@ -43,6 +49,7 @@
     <feature name=3D'popcnt'/>
     <feature name=3D'pse'/>
     <feature name=3D'pse36'/>
+    <feature name=3D'rdrand'/>
     <feature name=3D'rdtscp'/>
     <feature name=3D'rtm'/>
     <feature name=3D'sep'/>
@@ -55,7 +62,9 @@
     <feature name=3D'syscall'/>
     <feature name=3D'tsc'/>
     <feature name=3D'tsc-deadline'/>
+    <feature name=3D'vme'/>
     <feature name=3D'x2apic'/>
     <feature name=3D'xsave'/>
+    <feature name=3D'xsaveopt'/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Icelake-Server-noTSX.xml b/src/cpu_map/x86_Ice=
lake-Server-noTSX.xml
index f77bf6eb3e..2c0a4b7ef9 100644
--- a/src/cpu_map/x86_Icelake-Server-noTSX.xml
+++ b/src/cpu_map/x86_Icelake-Server-noTSX.xml
@@ -1,8 +1,15 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '0'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Xeon Processor (Icelake)'
+  'version.note': 'no TSX'
+-->
 <cpus>
   <model name=3D'Icelake-Server-noTSX'>
     <alias name=3D'Icelake-Server-v2'/>
-    <decode host=3D'on' guest=3D'off'/>
-    <signature family=3D'6' model=3D'106'/> <!-- 0606A5 -->
+    <decode host=3D'on' guest=3D'on'/>
+    <signature family=3D'6' model=3D'134'/>
     <vendor name=3D'Intel'/>
     <feature name=3D'3dnowprefetch'/>
     <feature name=3D'abm'/>
@@ -38,7 +45,6 @@
     <feature name=3D'fsgsbase'/>
     <feature name=3D'fxsr'/>
     <feature name=3D'gfni'/>
-    <feature name=3D'intel-pt' removed=3D'yes'/>
     <feature name=3D'invpcid'/>
     <feature name=3D'la57'/>
     <feature name=3D'lahf_lm'/>
@@ -47,7 +53,6 @@
     <feature name=3D'mce'/>
     <feature name=3D'mmx'/>
     <feature name=3D'movbe'/>
-    <feature name=3D'mpx'/>
     <feature name=3D'msr'/>
     <feature name=3D'mtrr'/>
     <feature name=3D'nx'/>
diff --git a/src/cpu_map/x86_Icelake-Server.xml b/src/cpu_map/x86_Icelake-S=
erver.xml
index 6bebbf174c..1a73c8170a 100644
--- a/src/cpu_map/x86_Icelake-Server.xml
+++ b/src/cpu_map/x86_Icelake-Server.xml
@@ -1,8 +1,14 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '0'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Xeon Processor (Icelake)'
+-->
 <cpus>
   <model name=3D'Icelake-Server'>
     <alias name=3D'Icelake-Server-v1'/>
     <decode host=3D'on' guest=3D'on'/>
-    <signature family=3D'6' model=3D'106'/> <!-- 0606A5 -->
+    <signature family=3D'6' model=3D'134'/>
     <vendor name=3D'Intel'/>
     <feature name=3D'3dnowprefetch'/>
     <feature name=3D'abm'/>
@@ -39,7 +45,6 @@
     <feature name=3D'fxsr'/>
     <feature name=3D'gfni'/>
     <feature name=3D'hle'/>
-    <feature name=3D'intel-pt' removed=3D'yes'/>
     <feature name=3D'invpcid'/>
     <feature name=3D'la57'/>
     <feature name=3D'lahf_lm'/>
@@ -48,7 +53,6 @@
     <feature name=3D'mce'/>
     <feature name=3D'mmx'/>
     <feature name=3D'movbe'/>
-    <feature name=3D'mpx'/>
     <feature name=3D'msr'/>
     <feature name=3D'mtrr'/>
     <feature name=3D'nx'/>
diff --git a/src/cpu_map/x86_IvyBridge-IBRS.xml b/src/cpu_map/x86_IvyBridge=
-IBRS.xml
index b2b257c11c..820722d5da 100644
--- a/src/cpu_map/x86_IvyBridge-IBRS.xml
+++ b/src/cpu_map/x86_IvyBridge-IBRS.xml
@@ -1,12 +1,19 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '9'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Xeon E3-12xx v2 (Ivy Bridge)'
+  'property.model-id': 'Intel Xeon E3-12xx v2 (Ivy Bridge, IBRS)'
+-->
 <cpus>
   <model name=3D'IvyBridge-IBRS'>
     <alias name=3D'IvyBridge-v2'/>
     <decode host=3D'on' guest=3D'on'/>
-    <signature family=3D'6' model=3D'58'/> <!-- 0306a0 -->
-    <signature family=3D'6' model=3D'62'/> <!-- 0306e0 -->
+    <signature family=3D'6' model=3D'58'/>
     <vendor name=3D'Intel'/>
     <feature name=3D'aes'/>
     <feature name=3D'apic'/>
+    <feature name=3D'arat'/>
     <feature name=3D'avx'/>
     <feature name=3D'clflush'/>
     <feature name=3D'cmov'/>
@@ -50,5 +57,6 @@
     <feature name=3D'vme'/>
     <feature name=3D'x2apic'/>
     <feature name=3D'xsave'/>
+    <feature name=3D'xsaveopt'/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_IvyBridge.xml b/src/cpu_map/x86_IvyBridge.xml
index 579af5f817..4a22cb3eb6 100644
--- a/src/cpu_map/x86_IvyBridge.xml
+++ b/src/cpu_map/x86_IvyBridge.xml
@@ -1,12 +1,18 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '9'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Xeon E3-12xx v2 (Ivy Bridge)'
+-->
 <cpus>
   <model name=3D'IvyBridge'>
     <alias name=3D'IvyBridge-v1'/>
     <decode host=3D'on' guest=3D'on'/>
-    <signature family=3D'6' model=3D'58'/> <!-- 0306a0 -->
-    <signature family=3D'6' model=3D'62'/> <!-- 0306e0 -->
+    <signature family=3D'6' model=3D'58'/>
     <vendor name=3D'Intel'/>
     <feature name=3D'aes'/>
     <feature name=3D'apic'/>
+    <feature name=3D'arat'/>
     <feature name=3D'avx'/>
     <feature name=3D'clflush'/>
     <feature name=3D'cmov'/>
@@ -49,5 +55,6 @@
     <feature name=3D'vme'/>
     <feature name=3D'x2apic'/>
     <feature name=3D'xsave'/>
+    <feature name=3D'xsaveopt'/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Nehalem-IBRS.xml b/src/cpu_map/x86_Nehalem-IBR=
S.xml
index 1d19cab20f..09f5d08306 100644
--- a/src/cpu_map/x86_Nehalem-IBRS.xml
+++ b/src/cpu_map/x86_Nehalem-IBRS.xml
@@ -1,11 +1,15 @@
+<!-- extra info from qemu:
+  'model.level': '11'
+  'model.stepping': '3'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Core i7 9xx (Nehalem Class Core i7)'
+  'property.model-id': 'Intel Core i7 9xx (Nehalem Core i7, IBRS update)'
+-->
 <cpus>
   <model name=3D'Nehalem-IBRS'>
     <alias name=3D'Nehalem-v2'/>
     <decode host=3D'on' guest=3D'on'/>
-    <signature family=3D'6' model=3D'26'/> <!-- 0106a0 -->
-    <signature family=3D'6' model=3D'30'/> <!-- 0106e0 -->
-    <signature family=3D'6' model=3D'31'/> <!-- 0106f0 -->
-    <signature family=3D'6' model=3D'46'/> <!-- 0206e0 -->
+    <signature family=3D'6' model=3D'26'/>
     <vendor name=3D'Intel'/>
     <feature name=3D'apic'/>
     <feature name=3D'clflush'/>
@@ -39,5 +43,6 @@
     <feature name=3D'ssse3'/>
     <feature name=3D'syscall'/>
     <feature name=3D'tsc'/>
+    <feature name=3D'vme'/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Nehalem.xml b/src/cpu_map/x86_Nehalem.xml
index 21f9aa1fff..28004accca 100644
--- a/src/cpu_map/x86_Nehalem.xml
+++ b/src/cpu_map/x86_Nehalem.xml
@@ -1,11 +1,14 @@
+<!-- extra info from qemu:
+  'model.level': '11'
+  'model.stepping': '3'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Core i7 9xx (Nehalem Class Core i7)'
+-->
 <cpus>
   <model name=3D'Nehalem'>
     <alias name=3D'Nehalem-v1'/>
     <decode host=3D'on' guest=3D'on'/>
-    <signature family=3D'6' model=3D'26'/> <!-- 0106a0 -->
-    <signature family=3D'6' model=3D'30'/> <!-- 0106e0 -->
-    <signature family=3D'6' model=3D'31'/> <!-- 0106f0 -->
-    <signature family=3D'6' model=3D'46'/> <!-- 0206e0 -->
+    <signature family=3D'6' model=3D'26'/>
     <vendor name=3D'Intel'/>
     <feature name=3D'apic'/>
     <feature name=3D'clflush'/>
@@ -38,5 +41,6 @@
     <feature name=3D'ssse3'/>
     <feature name=3D'syscall'/>
     <feature name=3D'tsc'/>
+    <feature name=3D'vme'/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_SandyBridge-IBRS.xml b/src/cpu_map/x86_SandyBr=
idge-IBRS.xml
index 24cc22f596..2b21fc9527 100644
--- a/src/cpu_map/x86_SandyBridge-IBRS.xml
+++ b/src/cpu_map/x86_SandyBridge-IBRS.xml
@@ -1,12 +1,19 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '1'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Xeon E312xx (Sandy Bridge)'
+  'property.model-id': 'Intel Xeon E312xx (Sandy Bridge, IBRS update)'
+-->
 <cpus>
   <model name=3D'SandyBridge-IBRS'>
     <alias name=3D'SandyBridge-v2'/>
     <decode host=3D'on' guest=3D'on'/>
-    <signature family=3D'6' model=3D'42'/> <!-- 0206a0 -->
-    <signature family=3D'6' model=3D'45'/> <!-- 0206d0 -->
+    <signature family=3D'6' model=3D'42'/>
     <vendor name=3D'Intel'/>
     <feature name=3D'aes'/>
     <feature name=3D'apic'/>
+    <feature name=3D'arat'/>
     <feature name=3D'avx'/>
     <feature name=3D'clflush'/>
     <feature name=3D'cmov'/>
@@ -42,7 +49,9 @@
     <feature name=3D'syscall'/>
     <feature name=3D'tsc'/>
     <feature name=3D'tsc-deadline'/>
+    <feature name=3D'vme'/>
     <feature name=3D'x2apic'/>
     <feature name=3D'xsave'/>
+    <feature name=3D'xsaveopt'/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_SandyBridge.xml b/src/cpu_map/x86_SandyBridge.=
xml
index 8faa73a86e..a72b3ca38f 100644
--- a/src/cpu_map/x86_SandyBridge.xml
+++ b/src/cpu_map/x86_SandyBridge.xml
@@ -1,12 +1,18 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '1'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Xeon E312xx (Sandy Bridge)'
+-->
 <cpus>
   <model name=3D'SandyBridge'>
     <alias name=3D'SandyBridge-v1'/>
     <decode host=3D'on' guest=3D'on'/>
-    <signature family=3D'6' model=3D'42'/> <!-- 0206a0 -->
-    <signature family=3D'6' model=3D'45'/> <!-- 0206d0 -->
+    <signature family=3D'6' model=3D'42'/>
     <vendor name=3D'Intel'/>
     <feature name=3D'aes'/>
     <feature name=3D'apic'/>
+    <feature name=3D'arat'/>
     <feature name=3D'avx'/>
     <feature name=3D'clflush'/>
     <feature name=3D'cmov'/>
@@ -41,7 +47,9 @@
     <feature name=3D'syscall'/>
     <feature name=3D'tsc'/>
     <feature name=3D'tsc-deadline'/>
+    <feature name=3D'vme'/>
     <feature name=3D'x2apic'/>
     <feature name=3D'xsave'/>
+    <feature name=3D'xsaveopt'/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_SapphireRapids.xml b/src/cpu_map/x86_SapphireR=
apids.xml
index 93307b37a2..9ea4c78e50 100644
--- a/src/cpu_map/x86_SapphireRapids.xml
+++ b/src/cpu_map/x86_SapphireRapids.xml
@@ -1,3 +1,9 @@
+<!-- extra info from qemu:
+  'model.level': '0x20'
+  'model.stepping': '4'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Xeon Processor (SapphireRapids)'
+-->
 <cpus>
   <model name=3D'SapphireRapids'>
     <alias name=3D'SapphireRapids-v1'/>
diff --git a/src/cpu_map/x86_Skylake-Client-IBRS.xml b/src/cpu_map/x86_Skyl=
ake-Client-IBRS.xml
index 9f0c0f75e8..6f6701fa39 100644
--- a/src/cpu_map/x86_Skylake-Client-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Client-IBRS.xml
@@ -1,13 +1,15 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '3'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Core Processor (Skylake)'
+  'property.model-id': 'Intel Core Processor (Skylake, IBRS)'
+-->
 <cpus>
   <model name=3D'Skylake-Client-IBRS'>
     <alias name=3D'Skylake-Client-v2'/>
     <decode host=3D'on' guest=3D'on'/>
-    <signature family=3D'6' model=3D'94'/> <!-- 0506e0 -->
-    <signature family=3D'6' model=3D'78'/> <!-- 0406e0 -->
-    <!-- These are Kaby Lake and Coffee Lake successors to Skylake,
-         but we don't have specific models for them. -->
-    <signature family=3D'6' model=3D'142'/> <!-- 0806e0 -->
-    <signature family=3D'6' model=3D'158'/> <!-- 0906e0 -->
+    <signature family=3D'6' model=3D'94'/>
     <vendor name=3D'Intel'/>
     <feature name=3D'3dnowprefetch'/>
     <feature name=3D'abm'/>
@@ -38,7 +40,6 @@
     <feature name=3D'mce'/>
     <feature name=3D'mmx'/>
     <feature name=3D'movbe'/>
-    <feature name=3D'mpx'/>
     <feature name=3D'msr'/>
     <feature name=3D'mtrr'/>
     <feature name=3D'nx'/>
diff --git a/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml b/src/cpu_map/x8=
6_Skylake-Client-noTSX-IBRS.xml
index cfb3446480..3846330e71 100644
--- a/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
@@ -1,13 +1,15 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '3'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Core Processor (Skylake)'
+  'property.model-id': 'Intel Core Processor (Skylake, IBRS, no TSX)'
+-->
 <cpus>
   <model name=3D'Skylake-Client-noTSX-IBRS'>
     <alias name=3D'Skylake-Client-v3'/>
-    <decode host=3D'on' guest=3D'off'/>
-    <signature family=3D'6' model=3D'94'/> <!-- 0506e0 -->
-    <signature family=3D'6' model=3D'78'/> <!-- 0406e0 -->
-    <!-- These are Kaby Lake and Coffee Lake successors to Skylake,
-         but we don't have specific models for them. -->
-    <signature family=3D'6' model=3D'142'/> <!-- 0806e0 -->
-    <signature family=3D'6' model=3D'158'/> <!-- 0906e0 -->
+    <decode host=3D'on' guest=3D'on'/>
+    <signature family=3D'6' model=3D'94'/>
     <vendor name=3D'Intel'/>
     <feature name=3D'3dnowprefetch'/>
     <feature name=3D'abm'/>
@@ -37,7 +39,6 @@
     <feature name=3D'mce'/>
     <feature name=3D'mmx'/>
     <feature name=3D'movbe'/>
-    <feature name=3D'mpx'/>
     <feature name=3D'msr'/>
     <feature name=3D'mtrr'/>
     <feature name=3D'nx'/>
diff --git a/src/cpu_map/x86_Skylake-Client.xml b/src/cpu_map/x86_Skylake-C=
lient.xml
index 1cef4fb1c7..ba9277d061 100644
--- a/src/cpu_map/x86_Skylake-Client.xml
+++ b/src/cpu_map/x86_Skylake-Client.xml
@@ -1,13 +1,14 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '3'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Core Processor (Skylake)'
+-->
 <cpus>
   <model name=3D'Skylake-Client'>
     <alias name=3D'Skylake-Client-v1'/>
     <decode host=3D'on' guest=3D'on'/>
-    <signature family=3D'6' model=3D'94'/> <!-- 0506e0 -->
-    <signature family=3D'6' model=3D'78'/> <!-- 0406e0 -->
-    <!-- These are Kaby Lake and Coffee Lake successors to Skylake,
-         but we don't have specific models for them. -->
-    <signature family=3D'6' model=3D'142'/> <!-- 0806e0 -->
-    <signature family=3D'6' model=3D'158'/> <!-- 0906e0 -->
+    <signature family=3D'6' model=3D'94'/>
     <vendor name=3D'Intel'/>
     <feature name=3D'3dnowprefetch'/>
     <feature name=3D'abm'/>
@@ -38,7 +39,6 @@
     <feature name=3D'mce'/>
     <feature name=3D'mmx'/>
     <feature name=3D'movbe'/>
-    <feature name=3D'mpx'/>
     <feature name=3D'msr'/>
     <feature name=3D'mtrr'/>
     <feature name=3D'nx'/>
diff --git a/src/cpu_map/x86_Skylake-Server-IBRS.xml b/src/cpu_map/x86_Skyl=
ake-Server-IBRS.xml
index a675e5fee6..2a4dd72fa3 100644
--- a/src/cpu_map/x86_Skylake-Server-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Server-IBRS.xml
@@ -1,8 +1,15 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '4'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Xeon Processor (Skylake)'
+  'property.model-id': 'Intel Xeon Processor (Skylake, IBRS)'
+-->
 <cpus>
   <model name=3D'Skylake-Server-IBRS'>
     <alias name=3D'Skylake-Server-v2'/>
     <decode host=3D'on' guest=3D'on'/>
-    <signature family=3D'6' model=3D'85' stepping=3D'0-4'/> <!-- 050654 -->
+    <signature family=3D'6' model=3D'85'/>
     <vendor name=3D'Intel'/>
     <feature name=3D'3dnowprefetch'/>
     <feature name=3D'abm'/>
@@ -39,7 +46,6 @@
     <feature name=3D'mce'/>
     <feature name=3D'mmx'/>
     <feature name=3D'movbe'/>
-    <feature name=3D'mpx'/>
     <feature name=3D'msr'/>
     <feature name=3D'mtrr'/>
     <feature name=3D'nx'/>
@@ -49,6 +55,7 @@
     <feature name=3D'pclmuldq'/>
     <feature name=3D'pdpe1gb'/>
     <feature name=3D'pge'/>
+    <feature name=3D'pku'/>
     <feature name=3D'pni'/>
     <feature name=3D'popcnt'/>
     <feature name=3D'pse'/>
diff --git a/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml b/src/cpu_map/x8=
6_Skylake-Server-noTSX-IBRS.xml
index 6d34904207..913493d6e2 100644
--- a/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
@@ -1,8 +1,15 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '4'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Xeon Processor (Skylake)'
+  'property.model-id': 'Intel Xeon Processor (Skylake, IBRS, no TSX)'
+-->
 <cpus>
   <model name=3D'Skylake-Server-noTSX-IBRS'>
     <alias name=3D'Skylake-Server-v3'/>
-    <decode host=3D'on' guest=3D'off'/>
-    <signature family=3D'6' model=3D'85' stepping=3D'0-4'/> <!-- 050654 -->
+    <decode host=3D'on' guest=3D'on'/>
+    <signature family=3D'6' model=3D'85'/>
     <vendor name=3D'Intel'/>
     <feature name=3D'3dnowprefetch'/>
     <feature name=3D'abm'/>
@@ -38,7 +45,6 @@
     <feature name=3D'mce'/>
     <feature name=3D'mmx'/>
     <feature name=3D'movbe'/>
-    <feature name=3D'mpx'/>
     <feature name=3D'msr'/>
     <feature name=3D'mtrr'/>
     <feature name=3D'nx'/>
@@ -48,6 +54,7 @@
     <feature name=3D'pclmuldq'/>
     <feature name=3D'pdpe1gb'/>
     <feature name=3D'pge'/>
+    <feature name=3D'pku'/>
     <feature name=3D'pni'/>
     <feature name=3D'popcnt'/>
     <feature name=3D'pse'/>
diff --git a/src/cpu_map/x86_Skylake-Server.xml b/src/cpu_map/x86_Skylake-S=
erver.xml
index 154bc7d848..1b72ae958e 100644
--- a/src/cpu_map/x86_Skylake-Server.xml
+++ b/src/cpu_map/x86_Skylake-Server.xml
@@ -1,8 +1,14 @@
+<!-- extra info from qemu:
+  'model.level': '0xd'
+  'model.stepping': '4'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Xeon Processor (Skylake)'
+-->
 <cpus>
   <model name=3D'Skylake-Server'>
     <alias name=3D'Skylake-Server-v1'/>
     <decode host=3D'on' guest=3D'on'/>
-    <signature family=3D'6' model=3D'85' stepping=3D'0-4'/> <!-- 050654 -->
+    <signature family=3D'6' model=3D'85'/>
     <vendor name=3D'Intel'/>
     <feature name=3D'3dnowprefetch'/>
     <feature name=3D'abm'/>
@@ -20,6 +26,7 @@
     <feature name=3D'bmi1'/>
     <feature name=3D'bmi2'/>
     <feature name=3D'clflush'/>
+    <feature name=3D'clflushopt'/>
     <feature name=3D'clwb'/>
     <feature name=3D'cmov'/>
     <feature name=3D'cx16'/>
@@ -39,7 +46,6 @@
     <feature name=3D'mce'/>
     <feature name=3D'mmx'/>
     <feature name=3D'movbe'/>
-    <feature name=3D'mpx'/>
     <feature name=3D'msr'/>
     <feature name=3D'mtrr'/>
     <feature name=3D'nx'/>
@@ -49,6 +55,7 @@
     <feature name=3D'pclmuldq'/>
     <feature name=3D'pdpe1gb'/>
     <feature name=3D'pge'/>
+    <feature name=3D'pku'/>
     <feature name=3D'pni'/>
     <feature name=3D'popcnt'/>
     <feature name=3D'pse'/>
diff --git a/src/cpu_map/x86_Snowridge.xml b/src/cpu_map/x86_Snowridge.xml
index 534295aa57..193393a127 100644
--- a/src/cpu_map/x86_Snowridge.xml
+++ b/src/cpu_map/x86_Snowridge.xml
@@ -1,8 +1,14 @@
+<!-- extra info from qemu:
+  'model.level': '27'
+  'model.stepping': '1'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Intel Atom Processor (SnowRidge)'
+-->
 <cpus>
   <model name=3D'Snowridge'>
     <alias name=3D'Snowridge-v1'/>
     <decode host=3D'on' guest=3D'on'/>
-    <signature family=3D'6' model=3D'134'/> <!-- 080665 -->
+    <signature family=3D'6' model=3D'134'/>
     <vendor name=3D'Intel'/>
     <feature name=3D'3dnowprefetch'/>
     <feature name=3D'aes'/>
@@ -31,6 +37,7 @@
     <feature name=3D'movbe'/>
     <feature name=3D'movdir64b'/>
     <feature name=3D'movdiri'/>
+    <feature name=3D'mpx'/>
     <feature name=3D'msr'/>
     <feature name=3D'mtrr'/>
     <feature name=3D'nx'/>
diff --git a/src/cpu_map/x86_Westmere-IBRS.xml b/src/cpu_map/x86_Westmere-I=
BRS.xml
index 46460b5a7d..5fcf98b243 100644
--- a/src/cpu_map/x86_Westmere-IBRS.xml
+++ b/src/cpu_map/x86_Westmere-IBRS.xml
@@ -1,11 +1,19 @@
+<!-- extra info from qemu:
+  'model.level': '11'
+  'model.stepping': '1'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Westmere E56xx/L56xx/X56xx (Nehalem-C)'
+  'property.model-id': 'Westmere E56xx/L56xx/X56xx (IBRS update)'
+-->
 <cpus>
   <model name=3D'Westmere-IBRS'>
     <alias name=3D'Westmere-v2'/>
     <decode host=3D'on' guest=3D'on'/>
-    <signature family=3D'6' model=3D'44'/> <!-- 0206c0 -->
+    <signature family=3D'6' model=3D'44'/>
     <vendor name=3D'Intel'/>
     <feature name=3D'aes'/>
     <feature name=3D'apic'/>
+    <feature name=3D'arat'/>
     <feature name=3D'clflush'/>
     <feature name=3D'cmov'/>
     <feature name=3D'cx16'/>
@@ -23,6 +31,7 @@
     <feature name=3D'nx'/>
     <feature name=3D'pae'/>
     <feature name=3D'pat'/>
+    <feature name=3D'pclmuldq'/>
     <feature name=3D'pge'/>
     <feature name=3D'pni'/>
     <feature name=3D'popcnt'/>
@@ -37,5 +46,6 @@
     <feature name=3D'ssse3'/>
     <feature name=3D'syscall'/>
     <feature name=3D'tsc'/>
+    <feature name=3D'vme'/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Westmere.xml b/src/cpu_map/x86_Westmere.xml
index 3e9dc0f73c..41f7eef94e 100644
--- a/src/cpu_map/x86_Westmere.xml
+++ b/src/cpu_map/x86_Westmere.xml
@@ -1,13 +1,18 @@
+<!-- extra info from qemu:
+  'model.level': '11'
+  'model.stepping': '1'
+  'model.xlevel': '0x80000008'
+  'model.model_id': 'Westmere E56xx/L56xx/X56xx (Nehalem-C)'
+-->
 <cpus>
   <model name=3D'Westmere'>
     <alias name=3D'Westmere-v1'/>
     <decode host=3D'on' guest=3D'on'/>
-    <signature family=3D'6' model=3D'44'/> <!-- 0206c0 -->
-    <signature family=3D'6' model=3D'47'/> <!-- 0206f0 -->
-    <signature family=3D'6' model=3D'37'/> <!-- 020650 -->
+    <signature family=3D'6' model=3D'44'/>
     <vendor name=3D'Intel'/>
     <feature name=3D'aes'/>
     <feature name=3D'apic'/>
+    <feature name=3D'arat'/>
     <feature name=3D'clflush'/>
     <feature name=3D'cmov'/>
     <feature name=3D'cx16'/>
@@ -25,6 +30,7 @@
     <feature name=3D'nx'/>
     <feature name=3D'pae'/>
     <feature name=3D'pat'/>
+    <feature name=3D'pclmuldq'/>
     <feature name=3D'pge'/>
     <feature name=3D'pni'/>
     <feature name=3D'popcnt'/>
@@ -38,5 +44,6 @@
     <feature name=3D'ssse3'/>
     <feature name=3D'syscall'/>
     <feature name=3D'tsc'/>
+    <feature name=3D'vme'/>
   </model>
 </cpus>
diff --git a/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-migratable.=
xml b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-migratable.xml
index f5846b1619..5012ab9cdf 100644
--- a/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-migratable.xml
+++ b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-migratable.xml
@@ -1,12 +1,12 @@
 <cpu mode=3D'custom' match=3D'exact'>
-  <model fallback=3D'allow'>Westmere</model>
+  <model fallback=3D'allow'>Nehalem</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'pclmuldq'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'x2apic'/>
   <feature policy=3D'require' name=3D'tsc-deadline'/>
+  <feature policy=3D'require' name=3D'aes'/>
   <feature policy=3D'require' name=3D'xsave'/>
   <feature policy=3D'require' name=3D'osxsave'/>
   <feature policy=3D'require' name=3D'avx'/>
diff --git a/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-result.xml =
b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-result.xml
index 166833276c..b3974f5090 100644
--- a/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-result.xml
+++ b/tests/cputestdata/x86_64-baseline-Westmere+Nehalem-result.xml
@@ -1,12 +1,12 @@
 <cpu mode=3D'custom' match=3D'exact'>
-  <model fallback=3D'allow'>Westmere</model>
+  <model fallback=3D'allow'>Nehalem</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'pclmuldq'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'x2apic'/>
   <feature policy=3D'require' name=3D'tsc-deadline'/>
+  <feature policy=3D'require' name=3D'aes'/>
   <feature policy=3D'require' name=3D'xsave'/>
   <feature policy=3D'require' name=3D'osxsave'/>
   <feature policy=3D'require' name=3D'avx'/>
diff --git a/tests/cputestdata/x86_64-baseline-features-expanded.xml b/test=
s/cputestdata/x86_64-baseline-features-expanded.xml
index e54eca026d..421bbbb78e 100644
--- a/tests/cputestdata/x86_64-baseline-features-expanded.xml
+++ b/tests/cputestdata/x86_64-baseline-features-expanded.xml
@@ -3,6 +3,7 @@
   <vendor>Intel</vendor>
   <feature policy=3D'require' name=3D'aes'/>
   <feature policy=3D'require' name=3D'apic'/>
+  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'avx'/>
   <feature policy=3D'require' name=3D'clflush'/>
   <feature policy=3D'require' name=3D'cmov'/>
diff --git a/tests/cputestdata/x86_64-baseline-features-result.xml b/tests/=
cputestdata/x86_64-baseline-features-result.xml
index 1461a5b430..307fd9566c 100644
--- a/tests/cputestdata/x86_64-baseline-features-result.xml
+++ b/tests/cputestdata/x86_64-baseline-features-result.xml
@@ -1,9 +1,7 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Westmere</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'pclmuldq'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'x2apic'/>
   <feature policy=3D'require' name=3D'tsc-deadline'/>
diff --git a/tests/cputestdata/x86_64-baseline-simple-expanded.xml b/tests/=
cputestdata/x86_64-baseline-simple-expanded.xml
index 82857e3d45..4b260d9972 100644
--- a/tests/cputestdata/x86_64-baseline-simple-expanded.xml
+++ b/tests/cputestdata/x86_64-baseline-simple-expanded.xml
@@ -2,6 +2,7 @@
   <model fallback=3D'forbid'>Westmere</model>
   <feature policy=3D'require' name=3D'aes'/>
   <feature policy=3D'require' name=3D'apic'/>
+  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'clflush'/>
   <feature policy=3D'require' name=3D'cmov'/>
   <feature policy=3D'require' name=3D'cx16'/>
@@ -19,6 +20,7 @@
   <feature policy=3D'require' name=3D'nx'/>
   <feature policy=3D'require' name=3D'pae'/>
   <feature policy=3D'require' name=3D'pat'/>
+  <feature policy=3D'require' name=3D'pclmuldq'/>
   <feature policy=3D'require' name=3D'pge'/>
   <feature policy=3D'require' name=3D'pni'/>
   <feature policy=3D'require' name=3D'popcnt'/>
@@ -32,4 +34,5 @@
   <feature policy=3D'require' name=3D'ssse3'/>
   <feature policy=3D'require' name=3D'syscall'/>
   <feature policy=3D'require' name=3D'tsc'/>
+  <feature policy=3D'require' name=3D'vme'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml b/tests/cpu=
testdata/x86_64-cpuid-Atom-P5362-host.xml
index 074342911a..98cf99c423 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
@@ -3,14 +3,12 @@
   <model>Westmere-IBRS</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'134' stepping=3D'5'/>
-  <feature name=3D'vme'/>
   <feature name=3D'ds'/>
   <feature name=3D'acpi'/>
   <feature name=3D'ss'/>
   <feature name=3D'ht'/>
   <feature name=3D'tm'/>
   <feature name=3D'pbe'/>
-  <feature name=3D'pclmuldq'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -26,7 +24,6 @@
   <feature name=3D'xsave'/>
   <feature name=3D'osxsave'/>
   <feature name=3D'rdrand'/>
-  <feature name=3D'arat'/>
   <feature name=3D'fsgsbase'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'smep'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml
index 22b5cf31fd..5c978b6295 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-guest.xml
@@ -1,7 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ds'/>
   <feature policy=3D'require' name=3D'acpi'/>
   <feature policy=3D'require' name=3D'ss'/>
@@ -19,7 +18,5 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'osxsave'/>
-  <feature policy=3D'require' name=3D'arat'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml b/tests/c=
putestdata/x86_64-cpuid-Core-i5-2500-host.xml
index cf8b175db1..a32b335dbe 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-host.xml
@@ -3,7 +3,6 @@
   <model>SandyBridge</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'42' stepping=3D'7'/>
-  <feature name=3D'vme'/>
   <feature name=3D'ds'/>
   <feature name=3D'acpi'/>
   <feature name=3D'ss'/>
@@ -21,7 +20,5 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'pcid'/>
   <feature name=3D'osxsave'/>
-  <feature name=3D'arat'/>
-  <feature name=3D'xsaveopt'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-json.xml b/tests/c=
putestdata/x86_64-cpuid-Core-i5-2500-json.xml
index c9ae651922..716813d858 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2500-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2500-json.xml
@@ -1,11 +1,8 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml b/tests=
/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml
index 22b5cf31fd..5c978b6295 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-guest.xml
@@ -1,7 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ds'/>
   <feature policy=3D'require' name=3D'acpi'/>
   <feature policy=3D'require' name=3D'ss'/>
@@ -19,7 +18,5 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'osxsave'/>
-  <feature policy=3D'require' name=3D'arat'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml
index cf8b175db1..a32b335dbe 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-host.xml
@@ -3,7 +3,6 @@
   <model>SandyBridge</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'42' stepping=3D'7'/>
-  <feature name=3D'vme'/>
   <feature name=3D'ds'/>
   <feature name=3D'acpi'/>
   <feature name=3D'ss'/>
@@ -21,7 +20,5 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'pcid'/>
   <feature name=3D'osxsave'/>
-  <feature name=3D'arat'/>
-  <feature name=3D'xsaveopt'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml
index c9ae651922..716813d858 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-2540M-json.xml
@@ -1,11 +1,8 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml b/tests=
/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
index 0ccbcd0629..7c0e12daf7 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
@@ -1,7 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ds'/>
   <feature policy=3D'require' name=3D'acpi'/>
   <feature policy=3D'require' name=3D'ss'/>
@@ -18,11 +17,8 @@
   <feature policy=3D'require' name=3D'xtpr'/>
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'osxsave'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
   <feature policy=3D'require' name=3D'invtsc'/>
+  <feature policy=3D'disable' name=3D'xsaveopt'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
index 827b16cb69..2b14dd3573 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
@@ -1,9 +1,8 @@
 <cpu>
   <arch>x86_64</arch>
-  <model>Haswell-noTSX</model>
+  <model>Westmere</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'60' stepping=3D'3'/>
-  <feature name=3D'vme'/>
   <feature name=3D'ds'/>
   <feature name=3D'acpi'/>
   <feature name=3D'ss'/>
@@ -17,14 +16,28 @@
   <feature name=3D'smx'/>
   <feature name=3D'est'/>
   <feature name=3D'tm2'/>
+  <feature name=3D'fma'/>
   <feature name=3D'xtpr'/>
   <feature name=3D'pdcm'/>
+  <feature name=3D'pcid'/>
+  <feature name=3D'x2apic'/>
+  <feature name=3D'movbe'/>
+  <feature name=3D'tsc-deadline'/>
+  <feature name=3D'xsave'/>
   <feature name=3D'osxsave'/>
+  <feature name=3D'avx'/>
   <feature name=3D'f16c'/>
   <feature name=3D'rdrand'/>
-  <feature name=3D'arat'/>
+  <feature name=3D'fsgsbase'/>
   <feature name=3D'tsc_adjust'/>
+  <feature name=3D'bmi1'/>
+  <feature name=3D'avx2'/>
+  <feature name=3D'smep'/>
+  <feature name=3D'bmi2'/>
+  <feature name=3D'erms'/>
+  <feature name=3D'invpcid'/>
   <feature name=3D'pdpe1gb'/>
+  <feature name=3D'rdtscp'/>
   <feature name=3D'abm'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-json.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i5-4670T-json.xml
index 489de49fb0..a450168451 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-json.xml
@@ -1,14 +1,10 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'vmx'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'disable' name=3D'arat'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-650-guest.xml b/tests/c=
putestdata/x86_64-cpuid-Core-i5-650-guest.xml
index 1c0d44dc0a..4ab1f51bcd 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-650-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-650-guest.xml
@@ -1,14 +1,12 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Westmere</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ds'/>
   <feature policy=3D'require' name=3D'acpi'/>
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'ht'/>
   <feature policy=3D'require' name=3D'tm'/>
   <feature policy=3D'require' name=3D'pbe'/>
-  <feature policy=3D'require' name=3D'pclmuldq'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -18,7 +16,6 @@
   <feature policy=3D'require' name=3D'tm2'/>
   <feature policy=3D'require' name=3D'xtpr'/>
   <feature policy=3D'require' name=3D'pdcm'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'rdtscp'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml b/tests/cp=
utestdata/x86_64-cpuid-Core-i5-650-host.xml
index 4234c4df5a..90aab1e0eb 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-650-host.xml
@@ -3,14 +3,12 @@
   <model>Westmere</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'37' stepping=3D'2'/>
-  <feature name=3D'vme'/>
   <feature name=3D'ds'/>
   <feature name=3D'acpi'/>
   <feature name=3D'ss'/>
   <feature name=3D'ht'/>
   <feature name=3D'tm'/>
   <feature name=3D'pbe'/>
-  <feature name=3D'pclmuldq'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -20,7 +18,6 @@
   <feature name=3D'tm2'/>
   <feature name=3D'xtpr'/>
   <feature name=3D'pdcm'/>
-  <feature name=3D'arat'/>
   <feature name=3D'rdtscp'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-650-json.xml b/tests/cp=
utestdata/x86_64-cpuid-Core-i5-650-json.xml
index cb21e48a9f..729e4d98b3 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-650-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-650-json.xml
@@ -1,13 +1,10 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Westmere</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'pclmuldq'/>
   <feature policy=3D'require' name=3D'x2apic'/>
   <feature policy=3D'require' name=3D'tsc-deadline'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'rdtscp'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
index 5777a0bfba..823494afa0 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
@@ -18,6 +18,7 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'osxsave'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
+  <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
   <feature policy=3D'require' name=3D'xsaves'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml b/tests/c=
putestdata/x86_64-cpuid-Core-i5-6600-host.xml
index c52e8db235..3511230df8 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
@@ -20,6 +20,7 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'osxsave'/>
   <feature name=3D'tsc_adjust'/>
+  <feature name=3D'mpx'/>
   <feature name=3D'clflushopt'/>
   <feature name=3D'intel-pt'/>
   <feature name=3D'xsaves'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-json.xml b/tests/c=
putestdata/x86_64-cpuid-Core-i5-6600-json.xml
index 61a52212a6..46111d8616 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-json.xml
@@ -4,6 +4,7 @@
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
+  <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'xsaves'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml
index 22b5cf31fd..5c978b6295 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-guest.xml
@@ -1,7 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ds'/>
   <feature policy=3D'require' name=3D'acpi'/>
   <feature policy=3D'require' name=3D'ss'/>
@@ -19,7 +18,5 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'osxsave'/>
-  <feature policy=3D'require' name=3D'arat'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml b/tests/c=
putestdata/x86_64-cpuid-Core-i7-2600-host.xml
index cf8b175db1..a32b335dbe 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-host.xml
@@ -3,7 +3,6 @@
   <model>SandyBridge</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'42' stepping=3D'7'/>
-  <feature name=3D'vme'/>
   <feature name=3D'ds'/>
   <feature name=3D'acpi'/>
   <feature name=3D'ss'/>
@@ -21,7 +20,5 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'pcid'/>
   <feature name=3D'osxsave'/>
-  <feature name=3D'arat'/>
-  <feature name=3D'xsaveopt'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml b/tests/c=
putestdata/x86_64-cpuid-Core-i7-2600-json.xml
index c9ae651922..716813d858 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-json.xml
@@ -1,11 +1,8 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-guest.xml=
 b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-guest.xml
index 9bb60009e8..893bbcb4f2 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-guest.xml
@@ -1,7 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ds'/>
   <feature policy=3D'require' name=3D'acpi'/>
   <feature policy=3D'require' name=3D'ss'/>
@@ -19,7 +18,6 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'osxsave'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'invtsc'/>
   <feature policy=3D'disable' name=3D'xsaveopt'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml =
b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml
index adcc4b86c5..96c7c14d9f 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-host.xml
@@ -1,9 +1,8 @@
 <cpu>
   <arch>x86_64</arch>
-  <model>SandyBridge</model>
+  <model>Westmere</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'42' stepping=3D'7'/>
-  <feature name=3D'vme'/>
   <feature name=3D'ds'/>
   <feature name=3D'acpi'/>
   <feature name=3D'ss'/>
@@ -20,7 +19,11 @@
   <feature name=3D'xtpr'/>
   <feature name=3D'pdcm'/>
   <feature name=3D'pcid'/>
+  <feature name=3D'x2apic'/>
+  <feature name=3D'tsc-deadline'/>
+  <feature name=3D'xsave'/>
   <feature name=3D'osxsave'/>
-  <feature name=3D'arat'/>
+  <feature name=3D'avx'/>
+  <feature name=3D'rdtscp'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-json.xml =
b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-json.xml
index 3a799052e7..26787052bb 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-2600-xsaveopt-json.xml
@@ -1,11 +1,9 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>SandyBridge</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'disable' name=3D'xsaveopt'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml b/tests=
/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml
index fa1a43a8a4..3a8e572f4a 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-guest.xml
@@ -18,7 +18,5 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'osxsave'/>
-  <feature policy=3D'require' name=3D'arat'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml
index 94352ee8bf..4de8a5afc3 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3520M-host.xml
@@ -20,7 +20,5 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'pcid'/>
   <feature name=3D'osxsave'/>
-  <feature name=3D'arat'/>
-  <feature name=3D'xsaveopt'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml b/test=
s/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml
index d52f49d30a..817e469ded 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-guest.xml
@@ -18,6 +18,6 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'osxsave'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'invtsc'/>
+  <feature policy=3D'disable' name=3D'xsaveopt'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml b/tests=
/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml
index e2503cd35c..de9eb7f6c4 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-host.xml
@@ -1,6 +1,6 @@
 <cpu>
   <arch>x86_64</arch>
-  <model>IvyBridge</model>
+  <model>Westmere</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'58' stepping=3D'9'/>
   <feature name=3D'ds'/>
@@ -19,7 +19,16 @@
   <feature name=3D'xtpr'/>
   <feature name=3D'pdcm'/>
   <feature name=3D'pcid'/>
+  <feature name=3D'x2apic'/>
+  <feature name=3D'tsc-deadline'/>
+  <feature name=3D'xsave'/>
   <feature name=3D'osxsave'/>
-  <feature name=3D'arat'/>
+  <feature name=3D'avx'/>
+  <feature name=3D'f16c'/>
+  <feature name=3D'rdrand'/>
+  <feature name=3D'fsgsbase'/>
+  <feature name=3D'smep'/>
+  <feature name=3D'erms'/>
+  <feature name=3D'rdtscp'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml b/tests=
/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml
index 60086b8b14..a3a7d0d2b2 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3740QM-json.xml
@@ -6,5 +6,5 @@
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
+  <feature policy=3D'disable' name=3D'arat'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml
index fa1a43a8a4..3a8e572f4a 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-guest.xml
@@ -18,7 +18,5 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'osxsave'/>
-  <feature policy=3D'require' name=3D'arat'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml b/tests/c=
putestdata/x86_64-cpuid-Core-i7-3770-host.xml
index 94352ee8bf..4de8a5afc3 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-host.xml
@@ -20,7 +20,5 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'pcid'/>
   <feature name=3D'osxsave'/>
-  <feature name=3D'arat'/>
-  <feature name=3D'xsaveopt'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-json.xml b/tests/c=
putestdata/x86_64-cpuid-Core-i7-3770-json.xml
index 1dc866dba1..0b98a6783f 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-3770-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-3770-json.xml
@@ -5,5 +5,5 @@
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
+  <feature policy=3D'disable' name=3D'arat'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-guest.xml b/tests=
/cputestdata/x86_64-cpuid-Core-i7-4510U-guest.xml
index bcce4ece11..79f40a3b03 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-guest.xml
@@ -1,7 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ds'/>
   <feature policy=3D'require' name=3D'acpi'/>
   <feature policy=3D'require' name=3D'ss'/>
@@ -17,13 +16,8 @@
   <feature policy=3D'require' name=3D'xtpr'/>
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'osxsave'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
   <feature policy=3D'require' name=3D'invtsc'/>
   <feature policy=3D'disable' name=3D'x2apic'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml
index a6307e834e..6b752f2a9b 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml
@@ -3,14 +3,12 @@
   <model>Westmere</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'69' stepping=3D'1'/>
-  <feature name=3D'vme'/>
   <feature name=3D'ds'/>
   <feature name=3D'acpi'/>
   <feature name=3D'ss'/>
   <feature name=3D'ht'/>
   <feature name=3D'tm'/>
   <feature name=3D'pbe'/>
-  <feature name=3D'pclmuldq'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -28,7 +26,6 @@
   <feature name=3D'avx'/>
   <feature name=3D'f16c'/>
   <feature name=3D'rdrand'/>
-  <feature name=3D'arat'/>
   <feature name=3D'fsgsbase'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'bmi1'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-json.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-4510U-json.xml
index 3ca3b0f243..11016a317d 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-json.xml
@@ -1,15 +1,9 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'vmx'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml b/tests=
/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
index 42e7c90112..beec659db7 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
@@ -1,7 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ds'/>
   <feature policy=3D'require' name=3D'acpi'/>
   <feature policy=3D'require' name=3D'ss'/>
@@ -18,12 +17,7 @@
   <feature policy=3D'require' name=3D'xtpr'/>
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'osxsave'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
index 8bbac47a2e..1e3bb3fd5f 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
@@ -3,7 +3,6 @@
   <model>Haswell-noTSX</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'69' stepping=3D'1'/>
-  <feature name=3D'vme'/>
   <feature name=3D'ds'/>
   <feature name=3D'acpi'/>
   <feature name=3D'ss'/>
@@ -20,12 +19,7 @@
   <feature name=3D'xtpr'/>
   <feature name=3D'pdcm'/>
   <feature name=3D'osxsave'/>
-  <feature name=3D'f16c'/>
-  <feature name=3D'rdrand'/>
-  <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
-  <feature name=3D'xsaveopt'/>
   <feature name=3D'pdpe1gb'/>
-  <feature name=3D'abm'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-json.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-4600U-json.xml
index 3ca3b0f243..11016a317d 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-json.xml
@@ -1,15 +1,9 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'vmx'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml b/=
tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml
index e825e2a0fb..1eab9af508 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml
@@ -1,7 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Broadwell</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ds'/>
   <feature policy=3D'require' name=3D'acpi'/>
   <feature policy=3D'require' name=3D'ss'/>
@@ -18,13 +17,8 @@
   <feature policy=3D'require' name=3D'xtpr'/>
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'osxsave'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml b/t=
ests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml
index b39148f37f..375411761f 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml
@@ -3,7 +3,6 @@
   <model>Broadwell</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'61' stepping=3D'4'/>
-  <feature name=3D'vme'/>
   <feature name=3D'ds'/>
   <feature name=3D'acpi'/>
   <feature name=3D'ss'/>
@@ -20,13 +19,8 @@
   <feature name=3D'xtpr'/>
   <feature name=3D'pdcm'/>
   <feature name=3D'osxsave'/>
-  <feature name=3D'f16c'/>
-  <feature name=3D'rdrand'/>
-  <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'intel-pt'/>
-  <feature name=3D'xsaveopt'/>
   <feature name=3D'pdpe1gb'/>
-  <feature name=3D'abm'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-json.xml b/t=
ests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-json.xml
index 4f253fc08a..8d58da5923 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-json.xml
@@ -1,14 +1,10 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Broadwell</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'vmx'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'disable' name=3D'arat'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml b/tests=
/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
index e825e2a0fb..1eab9af508 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
@@ -1,7 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Broadwell</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ds'/>
   <feature policy=3D'require' name=3D'acpi'/>
   <feature policy=3D'require' name=3D'ss'/>
@@ -18,13 +17,8 @@
   <feature policy=3D'require' name=3D'xtpr'/>
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'osxsave'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
index b39148f37f..375411761f 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
@@ -3,7 +3,6 @@
   <model>Broadwell</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'61' stepping=3D'4'/>
-  <feature name=3D'vme'/>
   <feature name=3D'ds'/>
   <feature name=3D'acpi'/>
   <feature name=3D'ss'/>
@@ -20,13 +19,8 @@
   <feature name=3D'xtpr'/>
   <feature name=3D'pdcm'/>
   <feature name=3D'osxsave'/>
-  <feature name=3D'f16c'/>
-  <feature name=3D'rdrand'/>
-  <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'intel-pt'/>
-  <feature name=3D'xsaveopt'/>
   <feature name=3D'pdpe1gb'/>
-  <feature name=3D'abm'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml b/=
tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml
index 5d3093cec1..beaf392ed9 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml
@@ -1,7 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Broadwell-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ds'/>
   <feature policy=3D'require' name=3D'acpi'/>
   <feature policy=3D'require' name=3D'ss'/>
@@ -18,14 +17,9 @@
   <feature policy=3D'require' name=3D'xtpr'/>
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'osxsave'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
   <feature policy=3D'require' name=3D'stibp'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml b/t=
ests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
index 2ab8890464..0559b556c1 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
@@ -3,7 +3,6 @@
   <model>Broadwell-IBRS</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'61' stepping=3D'4'/>
-  <feature name=3D'vme'/>
   <feature name=3D'ds'/>
   <feature name=3D'acpi'/>
   <feature name=3D'ss'/>
@@ -20,14 +19,9 @@
   <feature name=3D'xtpr'/>
   <feature name=3D'pdcm'/>
   <feature name=3D'osxsave'/>
-  <feature name=3D'f16c'/>
-  <feature name=3D'rdrand'/>
-  <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'intel-pt'/>
   <feature name=3D'stibp'/>
-  <feature name=3D'xsaveopt'/>
   <feature name=3D'pdpe1gb'/>
-  <feature name=3D'abm'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-json.xml b/t=
ests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-json.xml
index a736cdfb04..a8f6892741 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-json.xml
@@ -1,15 +1,9 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Broadwell</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'vmx'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml
index a736cdfb04..a8f6892741 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-json.xml
@@ -1,15 +1,9 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Broadwell</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'vmx'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml b/tests=
/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml
index b6e643cd08..711ccfc3ca 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml
@@ -19,6 +19,7 @@
   <feature policy=3D'require' name=3D'osxsave'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'sgx'/>
+  <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
   <feature policy=3D'require' name=3D'stibp'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
index 2a7493f941..735c9417ba 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
@@ -21,6 +21,7 @@
   <feature name=3D'osxsave'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'sgx'/>
+  <feature name=3D'mpx'/>
   <feature name=3D'clflushopt'/>
   <feature name=3D'intel-pt'/>
   <feature name=3D'stibp'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml
index 690081493b..068ea0fbb7 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-json.xml
@@ -5,6 +5,7 @@
   <feature policy=3D'require' name=3D'vmx'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
+  <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'umip'/>
   <feature policy=3D'require' name=3D'ssbd'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml
index 60bace9ed6..4f5c4103b4 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml
@@ -19,6 +19,7 @@
   <feature policy=3D'require' name=3D'osxsave'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'sgx'/>
+  <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
   <feature policy=3D'require' name=3D'xsaves'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml b/tests/c=
putestdata/x86_64-cpuid-Core-i7-7700-host.xml
index 6b9323842a..ae8f3e277a 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
@@ -21,6 +21,7 @@
   <feature name=3D'osxsave'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'sgx'/>
+  <feature name=3D'mpx'/>
   <feature name=3D'clflushopt'/>
   <feature name=3D'intel-pt'/>
   <feature name=3D'xsaves'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-json.xml b/tests/c=
putestdata/x86_64-cpuid-Core-i7-7700-json.xml
index 12424bc67c..cbdde0ff15 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-json.xml
@@ -4,6 +4,7 @@
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
+  <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml b/tests=
/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
index 5ed8ac37a3..90d6e53d3a 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
@@ -1,5 +1,5 @@
 <cpu mode=3D'custom' match=3D'exact'>
-  <model fallback=3D'forbid'>Skylake-Client-IBRS</model>
+  <model fallback=3D'forbid'>Skylake-Client-noTSX-IBRS</model>
   <vendor>Intel</vendor>
   <feature policy=3D'require' name=3D'ds'/>
   <feature policy=3D'require' name=3D'acpi'/>
@@ -18,6 +18,7 @@
   <feature policy=3D'require' name=3D'osxsave'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'sgx'/>
+  <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
   <feature policy=3D'require' name=3D'md-clear'/>
@@ -29,6 +30,4 @@
   <feature policy=3D'require' name=3D'invtsc'/>
   <feature policy=3D'require' name=3D'skip-l1dfl-vmentry'/>
   <feature policy=3D'require' name=3D'pschange-mc-no'/>
-  <feature policy=3D'disable' name=3D'hle'/>
-  <feature policy=3D'disable' name=3D'rtm'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
index 805a31411d..5bcc9af876 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
@@ -1,6 +1,6 @@
 <cpu>
   <arch>x86_64</arch>
-  <model>Skylake-Client-noTSX-IBRS</model>
+  <model>Skylake-Client-v4</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'142' stepping=3D'10'/>
   <feature name=3D'ds'/>
@@ -20,13 +20,13 @@
   <feature name=3D'osxsave'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'sgx'/>
+  <feature name=3D'mpx'/>
   <feature name=3D'clflushopt'/>
   <feature name=3D'intel-pt'/>
   <feature name=3D'md-clear'/>
   <feature name=3D'stibp'/>
   <feature name=3D'flush-l1d'/>
   <feature name=3D'ssbd'/>
-  <feature name=3D'xsaves'/>
   <feature name=3D'pdpe1gb'/>
   <feature name=3D'invtsc'/>
   <feature name=3D'skip-l1dfl-vmentry'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
index 4774d39c7e..a054ea0d27 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
@@ -1,10 +1,11 @@
 <cpu mode=3D'custom' match=3D'exact'>
-  <model fallback=3D'forbid'>Skylake-Client-IBRS</model>
+  <model fallback=3D'forbid'>Skylake-Client-noTSX-IBRS</model>
   <vendor>Intel</vendor>
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'vmx'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
+  <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'umip'/>
   <feature policy=3D'require' name=3D'md-clear'/>
@@ -15,6 +16,4 @@
   <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'skip-l1dfl-vmentry'/>
   <feature policy=3D'require' name=3D'pschange-mc-no'/>
-  <feature policy=3D'disable' name=3D'hle'/>
-  <feature policy=3D'disable' name=3D'rtm'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
index 6cedb93633..2d96f676ee 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
@@ -19,6 +19,7 @@
   <feature policy=3D'require' name=3D'osxsave'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'sgx'/>
+  <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
   <feature policy=3D'require' name=3D'sgxlc'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml b/tests/c=
putestdata/x86_64-cpuid-Core-i7-8700-host.xml
index 0cc65b4322..cc9a9efa76 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
@@ -21,6 +21,7 @@
   <feature name=3D'osxsave'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'sgx'/>
+  <feature name=3D'mpx'/>
   <feature name=3D'clflushopt'/>
   <feature name=3D'intel-pt'/>
   <feature name=3D'sgxlc'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-json.xml b/tests/c=
putestdata/x86_64-cpuid-Core-i7-8700-json.xml
index fd7539f7ce..a6f64f2020 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-json.xml
@@ -4,6 +4,7 @@
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
+  <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'umip'/>
   <feature policy=3D'require' name=3D'ssbd'/>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml=
 b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml
index 69dd1d9a87..e7c48d93cb 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml
@@ -8,5 +8,4 @@
   <feature policy=3D'require' name=3D'cmp_legacy'/>
   <feature policy=3D'disable' name=3D'rdtscp'/>
   <feature policy=3D'disable' name=3D'svm'/>
-  <feature policy=3D'disable' name=3D'monitor'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-json.xml b/te=
sts/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-json.xml
index 214916cdf8..9c1864c330 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-json.xml
@@ -7,5 +7,4 @@
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmp_legacy'/>
   <feature policy=3D'disable' name=3D'svm'/>
-  <feature policy=3D'disable' name=3D'monitor'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-json.xml=
 b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-json.xml
index 2ff92e2c15..0ea4877e9d 100644
--- a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-json.xml
@@ -1,5 +1,5 @@
 <cpu mode=3D'custom' match=3D'exact'>
-  <model fallback=3D'forbid'>Dhyana-v2</model>
+  <model fallback=3D'forbid'>Dhyana</model>
   <vendor>Hygon</vendor>
   <feature policy=3D'require' name=3D'x2apic'/>
   <feature policy=3D'require' name=3D'tsc-deadline'/>
@@ -7,6 +7,5 @@
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmp_legacy'/>
   <feature policy=3D'require' name=3D'virt-ssbd'/>
-  <feature policy=3D'disable' name=3D'xsaves'/>
   <feature policy=3D'disable' name=3D'svm'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml b/tes=
ts/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
index 38d95680d3..7c125bbd9a 100644
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
@@ -21,6 +21,7 @@
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'sgx'/>
   <feature policy=3D'require' name=3D'cmt'/>
+  <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'avx512ifma'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
   <feature policy=3D'require' name=3D'sha-ni'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml b/test=
s/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
index ccb74f41ef..54628b7a01 100644
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
@@ -23,6 +23,7 @@
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'sgx'/>
   <feature name=3D'cmt'/>
+  <feature name=3D'mpx'/>
   <feature name=3D'avx512ifma'/>
   <feature name=3D'intel-pt'/>
   <feature name=3D'sha-ni'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-json.xml b/test=
s/cputestdata/x86_64-cpuid-Ice-Lake-Server-json.xml
index ada11d2608..2c7fd79873 100644
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-json.xml
@@ -4,6 +4,7 @@
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
+  <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'avx512ifma'/>
   <feature policy=3D'require' name=3D'sha-ni'/>
   <feature policy=3D'require' name=3D'stibp'/>
@@ -12,5 +13,4 @@
   <feature policy=3D'require' name=3D'rdctl-no'/>
   <feature policy=3D'require' name=3D'ibrs-all'/>
   <feature policy=3D'require' name=3D'skip-l1dfl-vmentry'/>
-  <feature policy=3D'disable' name=3D'intel-pt'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml b/tests=
/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
index 20e2fa363a..db5e0ae6af 100644
--- a/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Pentium-P6100-guest.xml
@@ -1,7 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
-  <model fallback=3D'forbid'>Westmere</model>
+  <model fallback=3D'forbid'>core2duo</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ds'/>
   <feature policy=3D'require' name=3D'acpi'/>
   <feature policy=3D'require' name=3D'ss'/>
@@ -9,17 +8,16 @@
   <feature policy=3D'require' name=3D'tm'/>
   <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'dtes64'/>
-  <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
   <feature policy=3D'require' name=3D'est'/>
   <feature policy=3D'require' name=3D'tm2'/>
+  <feature policy=3D'require' name=3D'cx16'/>
   <feature policy=3D'require' name=3D'xtpr'/>
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'pcid'/>
+  <feature policy=3D'require' name=3D'popcnt'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'rdtscp'/>
+  <feature policy=3D'require' name=3D'lahf_lm'/>
   <feature policy=3D'require' name=3D'invtsc'/>
-  <feature policy=3D'disable' name=3D'sse4.1'/>
-  <feature policy=3D'disable' name=3D'sse4.2'/>
-  <feature policy=3D'disable' name=3D'aes'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-json.x=
ml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml
index 0ee1b03f8b..9e1990e053 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml
@@ -7,5 +7,4 @@
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmp_legacy'/>
   <feature policy=3D'disable' name=3D'sha-ni'/>
-  <feature policy=3D'disable' name=3D'monitor'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml b/tes=
ts/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
index ea1c79c0df..0af37fb828 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
@@ -19,6 +19,7 @@
   <feature policy=3D'require' name=3D'osxsave'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'sgx'/>
+  <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
   <feature policy=3D'require' name=3D'md-clear'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
index d7a7f30b9e..696f23145d 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
@@ -21,6 +21,7 @@
   <feature name=3D'osxsave'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'sgx'/>
+  <feature name=3D'mpx'/>
   <feature name=3D'clflushopt'/>
   <feature name=3D'intel-pt'/>
   <feature name=3D'md-clear'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
index a5591278df..624fb4692a 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-json.xml
@@ -4,6 +4,7 @@
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
+  <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'md-clear'/>
   <feature policy=3D'require' name=3D'stibp'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml b/tes=
ts/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml
index 60bace9ed6..4f5c4103b4 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml
@@ -19,6 +19,7 @@
   <feature policy=3D'require' name=3D'osxsave'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'sgx'/>
+  <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
   <feature policy=3D'require' name=3D'xsaves'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
index d2f808f9a6..e535a014c3 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
@@ -21,6 +21,7 @@
   <feature name=3D'osxsave'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'sgx'/>
+  <feature name=3D'mpx'/>
   <feature name=3D'clflushopt'/>
   <feature name=3D'intel-pt'/>
   <feature name=3D'xsaves'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-json.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-json.xml
index ad98679027..3558b9e6af 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-json.xml
@@ -5,6 +5,7 @@
   <feature policy=3D'require' name=3D'vmx'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
+  <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'xsaves'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml b/tes=
ts/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml
index d8aaaad29d..82756d8ebb 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml
@@ -1,7 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Haswell-noTSX-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ds'/>
   <feature policy=3D'require' name=3D'acpi'/>
   <feature policy=3D'require' name=3D'ss'/>
@@ -19,14 +18,9 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'dca'/>
   <feature policy=3D'require' name=3D'osxsave'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
   <feature policy=3D'require' name=3D'stibp'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml
index bc39536de9..c275e7eb4b 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml
@@ -3,7 +3,6 @@
   <model>Haswell-noTSX-IBRS</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'63' stepping=3D'2'/>
-  <feature name=3D'vme'/>
   <feature name=3D'ds'/>
   <feature name=3D'acpi'/>
   <feature name=3D'ss'/>
@@ -21,14 +20,9 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'dca'/>
   <feature name=3D'osxsave'/>
-  <feature name=3D'f16c'/>
-  <feature name=3D'rdrand'/>
-  <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
   <feature name=3D'stibp'/>
-  <feature name=3D'xsaveopt'/>
   <feature name=3D'pdpe1gb'/>
-  <feature name=3D'abm'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-json.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-json.xml
index 20e24c387d..f0a7e15754 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-json.xml
@@ -1,14 +1,8 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Haswell-noTSX-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml b/tes=
ts/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
index a5c6d9b471..e34fad1620 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
@@ -1,7 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Broadwell-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ds'/>
   <feature policy=3D'require' name=3D'acpi'/>
   <feature policy=3D'require' name=3D'ss'/>
@@ -19,17 +18,12 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'dca'/>
   <feature policy=3D'require' name=3D'osxsave'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
   <feature policy=3D'require' name=3D'stibp'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'mbm_total'/>
   <feature policy=3D'require' name=3D'mbm_local'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
index 70419d7944..a20cd7eff5 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
@@ -3,7 +3,6 @@
   <model>Broadwell-IBRS</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'79' stepping=3D'1'/>
-  <feature name=3D'vme'/>
   <feature name=3D'ds'/>
   <feature name=3D'acpi'/>
   <feature name=3D'ss'/>
@@ -21,17 +20,12 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'dca'/>
   <feature name=3D'osxsave'/>
-  <feature name=3D'f16c'/>
-  <feature name=3D'rdrand'/>
-  <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
   <feature name=3D'intel-pt'/>
   <feature name=3D'stibp'/>
-  <feature name=3D'xsaveopt'/>
   <feature name=3D'mbm_total'/>
   <feature name=3D'mbm_local'/>
   <feature name=3D'pdpe1gb'/>
-  <feature name=3D'abm'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-json.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-json.xml
index de082dbd93..193994481f 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-json.xml
@@ -1,14 +1,8 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Broadwell-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-guest.xml b/tes=
ts/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-guest.xml
index 980af07890..98b9d43916 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-guest.xml
@@ -1,7 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ds'/>
   <feature policy=3D'require' name=3D'acpi'/>
   <feature policy=3D'require' name=3D'ss'/>
@@ -19,13 +18,8 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'dca'/>
   <feature policy=3D'require' name=3D'osxsave'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml
index 6d959eedc3..446228723e 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml
@@ -3,7 +3,6 @@
   <model>Haswell-noTSX</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'63' stepping=3D'2'/>
-  <feature name=3D'vme'/>
   <feature name=3D'ds'/>
   <feature name=3D'acpi'/>
   <feature name=3D'ss'/>
@@ -21,13 +20,8 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'dca'/>
   <feature name=3D'osxsave'/>
-  <feature name=3D'f16c'/>
-  <feature name=3D'rdrand'/>
-  <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
-  <feature name=3D'xsaveopt'/>
   <feature name=3D'pdpe1gb'/>
-  <feature name=3D'abm'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-json.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-json.xml
index 78b8be1118..b3f1d2835e 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-json.xml
@@ -1,13 +1,9 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'disable' name=3D'arat'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml b/tes=
ts/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
index e2999db8e9..21254b6bca 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
@@ -1,7 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Broadwell</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ds'/>
   <feature policy=3D'require' name=3D'acpi'/>
   <feature policy=3D'require' name=3D'ss'/>
@@ -19,16 +18,11 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'dca'/>
   <feature policy=3D'require' name=3D'osxsave'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'mbm_total'/>
   <feature policy=3D'require' name=3D'mbm_local'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
index e2ace9021b..b4bc6c20a5 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
@@ -3,7 +3,6 @@
   <model>Broadwell</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'79' stepping=3D'1'/>
-  <feature name=3D'vme'/>
   <feature name=3D'ds'/>
   <feature name=3D'acpi'/>
   <feature name=3D'ss'/>
@@ -21,16 +20,11 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'dca'/>
   <feature name=3D'osxsave'/>
-  <feature name=3D'f16c'/>
-  <feature name=3D'rdrand'/>
-  <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
   <feature name=3D'intel-pt'/>
-  <feature name=3D'xsaveopt'/>
   <feature name=3D'mbm_total'/>
   <feature name=3D'mbm_local'/>
   <feature name=3D'pdpe1gb'/>
-  <feature name=3D'abm'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml
index 5b8891093a..c8de8dc4d9 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-json.xml
@@ -1,14 +1,8 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Broadwell</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml b/tests/=
cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml
index db1efe0549..4d83a04db7 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-guest.xml
@@ -1,7 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>SandyBridge-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ds'/>
   <feature policy=3D'require' name=3D'acpi'/>
   <feature policy=3D'require' name=3D'ss'/>
@@ -20,11 +19,9 @@
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'dca'/>
   <feature policy=3D'require' name=3D'osxsave'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'stibp'/>
   <feature policy=3D'require' name=3D'flush-l1d'/>
   <feature policy=3D'require' name=3D'ssbd'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml b/tests/c=
putestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
index 6f2de0ca5b..c6005df48e 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-host.xml
@@ -3,7 +3,6 @@
   <model>SandyBridge-IBRS</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'45' stepping=3D'7'/>
-  <feature name=3D'vme'/>
   <feature name=3D'ds'/>
   <feature name=3D'acpi'/>
   <feature name=3D'ss'/>
@@ -22,11 +21,9 @@
   <feature name=3D'pcid'/>
   <feature name=3D'dca'/>
   <feature name=3D'osxsave'/>
-  <feature name=3D'arat'/>
   <feature name=3D'stibp'/>
   <feature name=3D'flush-l1d'/>
   <feature name=3D'ssbd'/>
-  <feature name=3D'xsaveopt'/>
   <feature name=3D'pdpe1gb'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml b/tests/c=
putestdata/x86_64-cpuid-Xeon-E5-2650-json.xml
index bf587d3ffc..68c2d05ce0 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-json.xml
@@ -1,14 +1,11 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>SandyBridge-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'stibp'/>
   <feature policy=3D'require' name=3D'ssbd'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-guest.xml b/tes=
ts/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-guest.xml
index 980af07890..98b9d43916 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-guest.xml
@@ -1,7 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ds'/>
   <feature policy=3D'require' name=3D'acpi'/>
   <feature policy=3D'require' name=3D'ss'/>
@@ -19,13 +18,8 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'dca'/>
   <feature policy=3D'require' name=3D'osxsave'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml
index 6d959eedc3..446228723e 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml
@@ -3,7 +3,6 @@
   <model>Haswell-noTSX</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'63' stepping=3D'2'/>
-  <feature name=3D'vme'/>
   <feature name=3D'ds'/>
   <feature name=3D'acpi'/>
   <feature name=3D'ss'/>
@@ -21,13 +20,8 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'dca'/>
   <feature name=3D'osxsave'/>
-  <feature name=3D'f16c'/>
-  <feature name=3D'rdrand'/>
-  <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
-  <feature name=3D'xsaveopt'/>
   <feature name=3D'pdpe1gb'/>
-  <feature name=3D'abm'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-json.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-json.xml
index 2227ed0031..86f1091dec 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-json.xml
@@ -1,12 +1,10 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'vmx'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
+  <feature policy=3D'disable' name=3D'arat'/>
+  <feature policy=3D'disable' name=3D'xsaveopt'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml b/tes=
ts/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
index e2999db8e9..21254b6bca 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
@@ -1,7 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Broadwell</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ds'/>
   <feature policy=3D'require' name=3D'acpi'/>
   <feature policy=3D'require' name=3D'ss'/>
@@ -19,16 +18,11 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'dca'/>
   <feature policy=3D'require' name=3D'osxsave'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'mbm_total'/>
   <feature policy=3D'require' name=3D'mbm_local'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml
index e2ace9021b..b4bc6c20a5 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml
@@ -3,7 +3,6 @@
   <model>Broadwell</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'79' stepping=3D'1'/>
-  <feature name=3D'vme'/>
   <feature name=3D'ds'/>
   <feature name=3D'acpi'/>
   <feature name=3D'ss'/>
@@ -21,16 +20,11 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'dca'/>
   <feature name=3D'osxsave'/>
-  <feature name=3D'f16c'/>
-  <feature name=3D'rdrand'/>
-  <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
   <feature name=3D'intel-pt'/>
-  <feature name=3D'xsaveopt'/>
   <feature name=3D'mbm_total'/>
   <feature name=3D'mbm_local'/>
   <feature name=3D'pdpe1gb'/>
-  <feature name=3D'abm'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-json.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-json.xml
index 5b8891093a..c8de8dc4d9 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-json.xml
@@ -1,14 +1,8 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Broadwell</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml b/tests/=
cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml
index 659779687a..f6567f34d1 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-guest.xml
@@ -1,14 +1,12 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Westmere</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ds'/>
   <feature policy=3D'require' name=3D'acpi'/>
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'ht'/>
   <feature policy=3D'require' name=3D'tm'/>
   <feature policy=3D'require' name=3D'pbe'/>
-  <feature policy=3D'require' name=3D'pclmuldq'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -21,7 +19,6 @@
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'dca'/>
   <feature policy=3D'require' name=3D'x2apic'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'rdtscp'/>
   <feature policy=3D'require' name=3D'invtsc'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml b/tests/c=
putestdata/x86_64-cpuid-Xeon-E7-4820-host.xml
index 58468cd096..a93d99f082 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-host.xml
@@ -3,14 +3,12 @@
   <model>Westmere</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'47' stepping=3D'2'/>
-  <feature name=3D'vme'/>
   <feature name=3D'ds'/>
   <feature name=3D'acpi'/>
   <feature name=3D'ss'/>
   <feature name=3D'ht'/>
   <feature name=3D'tm'/>
   <feature name=3D'pbe'/>
-  <feature name=3D'pclmuldq'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -23,7 +21,6 @@
   <feature name=3D'pcid'/>
   <feature name=3D'dca'/>
   <feature name=3D'x2apic'/>
-  <feature name=3D'arat'/>
   <feature name=3D'pdpe1gb'/>
   <feature name=3D'rdtscp'/>
   <feature name=3D'invtsc'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml b/tests/c=
putestdata/x86_64-cpuid-Xeon-E7-4820-json.xml
index e8b74c5c30..9979c302fd 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4820-json.xml
@@ -1,12 +1,12 @@
 <cpu mode=3D'custom' match=3D'exact'>
-  <model fallback=3D'forbid'>Westmere</model>
+  <model fallback=3D'forbid'>Nehalem</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'pclmuldq'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'x2apic'/>
   <feature policy=3D'require' name=3D'tsc-deadline'/>
+  <feature policy=3D'require' name=3D'aes'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-guest.xml b/tests/=
cputestdata/x86_64-cpuid-Xeon-E7-4830-guest.xml
index 659779687a..f6567f34d1 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-guest.xml
@@ -1,14 +1,12 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Westmere</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ds'/>
   <feature policy=3D'require' name=3D'acpi'/>
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'ht'/>
   <feature policy=3D'require' name=3D'tm'/>
   <feature policy=3D'require' name=3D'pbe'/>
-  <feature policy=3D'require' name=3D'pclmuldq'/>
   <feature policy=3D'require' name=3D'dtes64'/>
   <feature policy=3D'require' name=3D'monitor'/>
   <feature policy=3D'require' name=3D'ds_cpl'/>
@@ -21,7 +19,6 @@
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'dca'/>
   <feature policy=3D'require' name=3D'x2apic'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'rdtscp'/>
   <feature policy=3D'require' name=3D'invtsc'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml b/tests/c=
putestdata/x86_64-cpuid-Xeon-E7-4830-host.xml
index 58468cd096..a93d99f082 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-host.xml
@@ -3,14 +3,12 @@
   <model>Westmere</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'47' stepping=3D'2'/>
-  <feature name=3D'vme'/>
   <feature name=3D'ds'/>
   <feature name=3D'acpi'/>
   <feature name=3D'ss'/>
   <feature name=3D'ht'/>
   <feature name=3D'tm'/>
   <feature name=3D'pbe'/>
-  <feature name=3D'pclmuldq'/>
   <feature name=3D'dtes64'/>
   <feature name=3D'monitor'/>
   <feature name=3D'ds_cpl'/>
@@ -23,7 +21,6 @@
   <feature name=3D'pcid'/>
   <feature name=3D'dca'/>
   <feature name=3D'x2apic'/>
-  <feature name=3D'arat'/>
   <feature name=3D'pdpe1gb'/>
   <feature name=3D'rdtscp'/>
   <feature name=3D'invtsc'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml b/tests/c=
putestdata/x86_64-cpuid-Xeon-E7-4830-json.xml
index da949ad25e..908945af29 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-4830-json.xml
@@ -1,14 +1,11 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Westmere</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'pclmuldq'/>
   <feature policy=3D'require' name=3D'pcid'/>
   <feature policy=3D'require' name=3D'x2apic'/>
   <feature policy=3D'require' name=3D'tsc-deadline'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'rdtscp'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-guest.xml b/tes=
ts/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-guest.xml
index 16d333aa26..3d49cea064 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-guest.xml
@@ -1,7 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Haswell</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ds'/>
   <feature policy=3D'require' name=3D'acpi'/>
   <feature policy=3D'require' name=3D'ss'/>
@@ -19,13 +18,8 @@
   <feature policy=3D'require' name=3D'pdcm'/>
   <feature policy=3D'require' name=3D'dca'/>
   <feature policy=3D'require' name=3D'osxsave'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
   <feature policy=3D'require' name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml
index 6a18204c02..4297116353 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml
@@ -3,7 +3,6 @@
   <model>Haswell</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'63' stepping=3D'4'/>
-  <feature name=3D'vme'/>
   <feature name=3D'ds'/>
   <feature name=3D'acpi'/>
   <feature name=3D'ss'/>
@@ -21,13 +20,8 @@
   <feature name=3D'pdcm'/>
   <feature name=3D'dca'/>
   <feature name=3D'osxsave'/>
-  <feature name=3D'f16c'/>
-  <feature name=3D'rdrand'/>
-  <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
-  <feature name=3D'xsaveopt'/>
   <feature name=3D'pdpe1gb'/>
-  <feature name=3D'abm'/>
   <feature name=3D'invtsc'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-json.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-json.xml
index e542456c8b..4fa824ebfc 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-json.xml
@@ -1,14 +1,8 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Haswell</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-guest.xml b/tests/cp=
utestdata/x86_64-cpuid-Xeon-E7540-guest.xml
index fbc05fe0d8..64fae823ec 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-guest.xml
@@ -1,7 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Nehalem-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ds'/>
   <feature policy=3D'require' name=3D'acpi'/>
   <feature policy=3D'require' name=3D'ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml b/tests/cpu=
testdata/x86_64-cpuid-Xeon-E7540-host.xml
index 15fea29e06..ed5e7e00f5 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-host.xml
@@ -3,7 +3,6 @@
   <model>Nehalem-IBRS</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'46' stepping=3D'6'/>
-  <feature name=3D'vme'/>
   <feature name=3D'ds'/>
   <feature name=3D'acpi'/>
   <feature name=3D'ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-json.xml b/tests/cpu=
testdata/x86_64-cpuid-Xeon-E7540-json.xml
index 32cd1000c8..3726a1e312 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7540-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7540-json.xml
@@ -1,7 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Nehalem-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'x2apic'/>
   <feature policy=3D'require' name=3D'tsc-deadline'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
index 8f014f6e28..fe6db40258 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
@@ -20,9 +20,9 @@
   <feature policy=3D'require' name=3D'osxsave'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
+  <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
-  <feature policy=3D'require' name=3D'pku'/>
   <feature policy=3D'require' name=3D'stibp'/>
   <feature policy=3D'require' name=3D'xsaves'/>
   <feature policy=3D'require' name=3D'mbm_total'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml b/tests=
/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
index e004747ada..d3020f0f4f 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
@@ -22,9 +22,9 @@
   <feature name=3D'osxsave'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
+  <feature name=3D'mpx'/>
   <feature name=3D'clflushopt'/>
   <feature name=3D'intel-pt'/>
-  <feature name=3D'pku'/>
   <feature name=3D'stibp'/>
   <feature name=3D'xsaves'/>
   <feature name=3D'mbm_total'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-json.xml b/tests=
/cputestdata/x86_64-cpuid-Xeon-Gold-5115-json.xml
index 7c7e95ce0d..d20dc7575f 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-json.xml
@@ -4,5 +4,7 @@
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
+  <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
+  <feature policy=3D'disable' name=3D'pku'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
index f4f0199607..f3164525c4 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
@@ -20,9 +20,9 @@
   <feature policy=3D'require' name=3D'osxsave'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
+  <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
-  <feature policy=3D'require' name=3D'pku'/>
   <feature policy=3D'require' name=3D'ospke'/>
   <feature policy=3D'require' name=3D'md-clear'/>
   <feature policy=3D'require' name=3D'stibp'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml b/tests=
/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
index 325c2fe26f..60e45e2e67 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
@@ -22,9 +22,9 @@
   <feature name=3D'osxsave'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
+  <feature name=3D'mpx'/>
   <feature name=3D'clflushopt'/>
   <feature name=3D'intel-pt'/>
-  <feature name=3D'pku'/>
   <feature name=3D'ospke'/>
   <feature name=3D'md-clear'/>
   <feature name=3D'stibp'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml b/tests=
/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
index b482043ccf..65b93c2829 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-json.xml
@@ -5,9 +5,9 @@
   <feature policy=3D'require' name=3D'vmx'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
+  <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'umip'/>
-  <feature policy=3D'require' name=3D'pku'/>
   <feature policy=3D'require' name=3D'md-clear'/>
   <feature policy=3D'require' name=3D'stibp'/>
   <feature policy=3D'require' name=3D'arch-capabilities'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
index f31ca1ffc5..0d198c991b 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
@@ -20,9 +20,8 @@
   <feature policy=3D'require' name=3D'osxsave'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
-  <feature policy=3D'require' name=3D'clflushopt'/>
+  <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
-  <feature policy=3D'require' name=3D'pku'/>
   <feature policy=3D'require' name=3D'xsaves'/>
   <feature policy=3D'require' name=3D'mbm_total'/>
   <feature policy=3D'require' name=3D'mbm_local'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml b/tests=
/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
index da7e96e533..4ee12fcfdc 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
@@ -22,9 +22,8 @@
   <feature name=3D'osxsave'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
-  <feature name=3D'clflushopt'/>
+  <feature name=3D'mpx'/>
   <feature name=3D'intel-pt'/>
-  <feature name=3D'pku'/>
   <feature name=3D'xsaves'/>
   <feature name=3D'mbm_total'/>
   <feature name=3D'mbm_local'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml b/tests=
/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml
index 1dfad4a0cb..42f2497776 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-json.xml
@@ -4,5 +4,6 @@
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
-  <feature policy=3D'require' name=3D'clflushopt'/>
+  <feature policy=3D'require' name=3D'mpx'/>
+  <feature policy=3D'disable' name=3D'pku'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml b/t=
ests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
index 78863c61d1..77d1f873a1 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-json.xml
@@ -4,8 +4,8 @@
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
+  <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'umip'/>
-  <feature policy=3D'require' name=3D'pku'/>
   <feature policy=3D'require' name=3D'xsaves'/>
   <feature policy=3D'require' name=3D'rdctl-no'/>
   <feature policy=3D'require' name=3D'ibrs-all'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml b/tests/cp=
utestdata/x86_64-cpuid-Xeon-W3520-guest.xml
index 9c975c6792..29e119100f 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-guest.xml
@@ -1,7 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Nehalem</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ds'/>
   <feature policy=3D'require' name=3D'acpi'/>
   <feature policy=3D'require' name=3D'ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml b/tests/cpu=
testdata/x86_64-cpuid-Xeon-W3520-host.xml
index 35dd63f360..07d69d1c71 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-host.xml
@@ -3,7 +3,6 @@
   <model>Nehalem</model>
   <vendor>Intel</vendor>
   <signature family=3D'6' model=3D'26' stepping=3D'5'/>
-  <feature name=3D'vme'/>
   <feature name=3D'ds'/>
   <feature name=3D'acpi'/>
   <feature name=3D'ss'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml b/tests/cpu=
testdata/x86_64-cpuid-Xeon-W3520-json.xml
index 038c98e1d1..fdd1b5cfae 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-W3520-json.xml
@@ -1,7 +1,6 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'forbid'>Nehalem</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'x2apic'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Broadwell-IBRS+Cascade=
lake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Broadwell-IBRS+Cascadela=
ke.xml
index 99bce8db87..b88e71ce39 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Broadwell-IBRS+Cascadelake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Broadwell-IBRS+Cascadelake.xml
@@ -1,14 +1,8 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'allow'>Broadwell-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake-IB=
RS.xml b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake-IBRS.x=
ml
index 5e42876b39..698613a8a0 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake-IBRS.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake-IBRS.xml
@@ -4,9 +4,9 @@
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
+  <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'umip'/>
-  <feature policy=3D'require' name=3D'pku'/>
   <feature policy=3D'require' name=3D'ssbd'/>
   <feature policy=3D'require' name=3D'xsaves'/>
   <feature policy=3D'require' name=3D'skip-l1dfl-vmentry'/>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake.xm=
l b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake.xml
index 906259df0b..3383eb30d2 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Cascadelake+Skylake.xml
@@ -4,5 +4,6 @@
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
-  <feature policy=3D'require' name=3D'clflushopt'/>
+  <feature policy=3D'require' name=3D'mpx'/>
+  <feature policy=3D'disable' name=3D'pku'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-EPYC+Rome.xml b/tests/=
cputestdata/x86_64-cpuid-baseline-EPYC+Rome.xml
index 66f89b118a..207c904158 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-EPYC+Rome.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-EPYC+Rome.xml
@@ -7,5 +7,4 @@
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmp_legacy'/>
   <feature policy=3D'disable' name=3D'svm'/>
-  <feature policy=3D'disable' name=3D'monitor'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Haswell+Skylake.xml b/=
tests/cputestdata/x86_64-cpuid-baseline-Haswell+Skylake.xml
index e687a679b3..6f89d05744 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Haswell+Skylake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Haswell+Skylake.xml
@@ -1,14 +1,8 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'allow'>Haswell</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Bro=
adwell.xml b/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Bro=
adwell.xml
index 651457b17a..da0c7b7969 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Broadwell.=
xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Broadwell.=
xml
@@ -1,14 +1,8 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'allow'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Sky=
lake-IBRS.xml b/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+=
Skylake-IBRS.xml
index 8bda1c02e2..f794e9027b 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Skylake-IB=
RS.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Skylake-IB=
RS.xml
@@ -1,14 +1,8 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'allow'>Haswell-noTSX-IBRS</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Sky=
lake.xml b/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Skyla=
ke.xml
index 651457b17a..da0c7b7969 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Skylake.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Haswell-noTSX-IBRS+Skylake.xml
@@ -1,14 +1,8 @@
 <cpu mode=3D'custom' match=3D'exact'>
   <model fallback=3D'allow'>Haswell-noTSX</model>
   <vendor>Intel</vendor>
-  <feature policy=3D'require' name=3D'vme'/>
   <feature policy=3D'require' name=3D'ss'/>
-  <feature policy=3D'require' name=3D'f16c'/>
-  <feature policy=3D'require' name=3D'rdrand'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
-  <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
-  <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
-  <feature policy=3D'require' name=3D'abm'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Ryzen+Rome.xml b/tests=
/cputestdata/x86_64-cpuid-baseline-Ryzen+Rome.xml
index 308869a308..b4d56921b4 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Ryzen+Rome.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Ryzen+Rome.xml
@@ -7,5 +7,4 @@
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmp_legacy'/>
   <feature policy=3D'disable' name=3D'sha-ni'/>
-  <feature policy=3D'disable' name=3D'monitor'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-baseline-Skylake-Client+Server.=
xml b/tests/cputestdata/x86_64-cpuid-baseline-Skylake-Client+Server.xml
index d46ff26eeb..7091fec30d 100644
--- a/tests/cputestdata/x86_64-cpuid-baseline-Skylake-Client+Server.xml
+++ b/tests/cputestdata/x86_64-cpuid-baseline-Skylake-Client+Server.xml
@@ -4,6 +4,7 @@
   <feature policy=3D'require' name=3D'ss'/>
   <feature policy=3D'require' name=3D'hypervisor'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
+  <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
 </cpu>
diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domainc=
apsdata/qemu_4.2.0-q35.x86_64.xml
index 010bf581af..990b412e44 100644
--- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
@@ -48,6 +48,7 @@
       <feature policy=3D'require' name=3D'vmx'/>
       <feature policy=3D'require' name=3D'hypervisor'/>
       <feature policy=3D'require' name=3D'tsc_adjust'/>
+      <feature policy=3D'require' name=3D'mpx'/>
       <feature policy=3D'require' name=3D'clflushopt'/>
       <feature policy=3D'require' name=3D'umip'/>
       <feature policy=3D'require' name=3D'md-clear'/>
diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsd=
ata/qemu_4.2.0.x86_64.xml
index e3b70598cd..df54a4d279 100644
--- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
@@ -47,6 +47,7 @@
       <feature policy=3D'require' name=3D'vmx'/>
       <feature policy=3D'require' name=3D'hypervisor'/>
       <feature policy=3D'require' name=3D'tsc_adjust'/>
+      <feature policy=3D'require' name=3D'mpx'/>
       <feature policy=3D'require' name=3D'clflushopt'/>
       <feature policy=3D'require' name=3D'umip'/>
       <feature policy=3D'require' name=3D'md-clear'/>
diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domainc=
apsdata/qemu_5.0.0-q35.x86_64.xml
index 578a9c80c6..826476c807 100644
--- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
@@ -48,6 +48,7 @@
       <feature policy=3D'require' name=3D'vmx'/>
       <feature policy=3D'require' name=3D'hypervisor'/>
       <feature policy=3D'require' name=3D'tsc_adjust'/>
+      <feature policy=3D'require' name=3D'mpx'/>
       <feature policy=3D'require' name=3D'clflushopt'/>
       <feature policy=3D'require' name=3D'umip'/>
       <feature policy=3D'require' name=3D'md-clear'/>
diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsd=
ata/qemu_5.0.0.x86_64.xml
index 9c7e6e1df3..0c88b239da 100644
--- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
@@ -47,6 +47,7 @@
       <feature policy=3D'require' name=3D'vmx'/>
       <feature policy=3D'require' name=3D'hypervisor'/>
       <feature policy=3D'require' name=3D'tsc_adjust'/>
+      <feature policy=3D'require' name=3D'mpx'/>
       <feature policy=3D'require' name=3D'clflushopt'/>
       <feature policy=3D'require' name=3D'umip'/>
       <feature policy=3D'require' name=3D'md-clear'/>
diff --git a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-lates=
t.args b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.ar=
gs
index c841bb80c8..2c8b083773 100644
--- a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-test/.c=
onfig \
 -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va=
r/lib/libvirt/qemu/domain--1-test/master-key.aes"}' \
 -machine pc,usb=3Doff,dump-guest-core=3Doff,memory-backend=3Dpc.ram,acpi=
=3Doff \
 -accel kvm \
--cpu Icelake-Server,intel-pt=3Doff \
+-cpu Icelake-Server \
 -m size=3D219136k \
 -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}'=
 \
 -overcommit mem-lock=3Doff \
diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args b/test=
s/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args
index 945163795d..977bc6ee21 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
 -machine pc-q35-4.2,usb=3Doff,dump-guest-core=3Doff \
 -accel kvm \
--cpu Skylake-Client-IBRS,ss=3Don,vmx=3Don,hypervisor=3Don,tsc-adjust=3Don,=
clflushopt=3Don,umip=3Don,md-clear=3Don,stibp=3Don,arch-capabilities=3Don,s=
sbd=3Don,xsaves=3Don,pdpe1gb=3Don,skip-l1dfl-vmentry=3Don,pschange-mc-no=3D=
on \
+-cpu Skylake-Client-IBRS,ss=3Don,vmx=3Don,hypervisor=3Don,tsc-adjust=3Don,=
mpx=3Don,clflushopt=3Don,umip=3Don,md-clear=3Don,stibp=3Don,arch-capabiliti=
es=3Don,ssbd=3Don,xsaves=3Don,pdpe1gb=3Don,skip-l1dfl-vmentry=3Don,pschange=
-mc-no=3Don \
 -m size=3D219136k \
 -overcommit mem-lock=3Doff \
 -smp 1,sockets=3D1,cores=3D1,threads=3D1 \
diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args b/test=
s/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args
index 95c88f1ace..c9ea13bb81 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args
@@ -12,7 +12,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue=
st1/.config \
 -object secret,id=3DmasterKey0,format=3Draw,file=3D/var/lib/libvirt/qemu/d=
omain--1-QEMUGuest1/master-key.aes \
 -machine pc-q35-5.0,usb=3Doff,dump-guest-core=3Doff \
 -accel kvm \
--cpu Skylake-Client-IBRS,ss=3Don,vmx=3Don,hypervisor=3Don,tsc-adjust=3Don,=
clflushopt=3Don,umip=3Don,md-clear=3Don,stibp=3Don,arch-capabilities=3Don,s=
sbd=3Don,xsaves=3Don,pdpe1gb=3Don,skip-l1dfl-vmentry=3Don,pschange-mc-no=3D=
on \
+-cpu Skylake-Client-IBRS,ss=3Don,vmx=3Don,hypervisor=3Don,tsc-adjust=3Don,=
mpx=3Don,clflushopt=3Don,umip=3Don,md-clear=3Don,stibp=3Don,arch-capabiliti=
es=3Don,ssbd=3Don,xsaves=3Don,pdpe1gb=3Don,skip-l1dfl-vmentry=3Don,pschange=
-mc-no=3Don \
 -m size=3D219136k \
 -overcommit mem-lock=3Doff \
 -smp 1,sockets=3D1,cores=3D1,threads=3D1 \
--=20
2.41.0
_______________________________________________
Devel mailing list -- devel@lists.libvirt.org
To unsubscribe send an email to devel-leave@lists.libvirt.org