From nobody Mon Feb  9 17:22:43 2026
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 216.205.24.124 as permitted sender) client-ip=216.205.24.124;
 envelope-from=libvir-list-bounces@redhat.com;
 helo=us-smtp-delivery-124.mimecast.com;
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass(p=none dis=none)  header.from=redhat.com
ARC-Seal: i=1; a=rsa-sha256; t=1602771514; cv=none;
	d=zohomail.com; s=zohoarc;
	b=TxhNWBscp5AI07diIM+mlNWHckg7Z/cy/8Xacnl2Y4Ihm8j8b2LZ+sFjzxWkpTYVXeESMhakdRU1SthnS5wdMR8EowCoxQnQsb/SVJbPos5ZMsQ/3xtCVFlrVrsvQIVHrbzaO/qwOiU9/7BvJS1xikf9KBZYc5qQ74DWGU+AY/0=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1602771514;
 h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
	bh=d5OvYdWhk+O21AGzsFkYPlwbJo2H7GMHVvcJtLYoem8=;
	b=ajLMdciENjwsXoY32qqJN/5AV8jaRmefoQu/A4nutYmVqln+gMbE4ikyPzPhvOrZXRFUZi5ztUUepktuEnRf1w7JLOcYfIT6FDmw7BY6LbRGpxz4LItynmWoLWW6ZFgzNrUvi7HgBnSI9Kq/gVASl+Ttpw1xGwAEDxBMgrrXSgg=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<twiederh@redhat.com> (p=none dis=none)
 header.from=<twiederh@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com
	with SMTPS id 1602771514518596.4510141472289;
 Thu, 15 Oct 2020 07:18:34 -0700 (PDT)
Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com
 [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id
 us-mta-543-Q7yOgwXkPlqooaZyC0iXkg-1; Thu, 15 Oct 2020 10:18:28 -0400
Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com
 [10.5.11.23])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2811F8015FD;
	Thu, 15 Oct 2020 14:18:22 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id F06C119931;
	Thu, 15 Oct 2020 14:18:21 +0000 (UTC)
Received: from lists01.pubmisc.prod.ext.phx2.redhat.com
 (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33])
	by colo-mx.corp.redhat.com (Postfix) with ESMTP id B76675810F;
	Thu, 15 Oct 2020 14:18:21 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
	[10.5.11.13])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 09FEIEJf006969 for <libvir-list@listman.util.phx.redhat.com>;
	Thu, 15 Oct 2020 10:18:14 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id B61B06EF52; Thu, 15 Oct 2020 14:18:14 +0000 (UTC)
Received: from work.redhat.com (ovpn-112-170.ams2.redhat.com [10.36.112.170])
	by smtp.corp.redhat.com (Postfix) with ESMTP id B1A066EF68;
	Thu, 15 Oct 2020 14:18:13 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1602771512;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:cc:mime-version:mime-version:
	 content-type:content-type:
	 content-transfer-encoding:content-transfer-encoding:
	 in-reply-to:in-reply-to:references:references:list-id:list-help:
	 list-unsubscribe:list-subscribe:list-post;
	bh=d5OvYdWhk+O21AGzsFkYPlwbJo2H7GMHVvcJtLYoem8=;
	b=eytKgeg2LXRgK6z1euMKHPgQmLR7cKPycLlGkEEzEcRRN9r6bA4/bs+6yYqs4t5ac6/vzr
	tP7045LMXeL/3Fx0oMiHkWy0UY2qj3jBDnuoy3gN+9Jl0OY+U8x9Aw4hfBzBna9D05QX6F
	RpPXCcLQXE19gL/kCbAmKWQkeHbPHZg=
X-MC-Unique: Q7yOgwXkPlqooaZyC0iXkg-1
From: Tim Wiederhake <twiederh@redhat.com>
To: libvir-list@redhat.com
Subject: [libvirt PATCH 3/3] [DONTMERGE] Sample output of new sync script
Date: Thu, 15 Oct 2020 16:18:05 +0200
Message-Id: <20201015141805.143762-4-twiederh@redhat.com>
In-Reply-To: <20201015141805.143762-1-twiederh@redhat.com>
References: <20201015141805.143762-1-twiederh@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13
X-loop: libvir-list@redhat.com
Cc: Tim Wiederhake <twiederh@redhat.com>
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.12
Precedence: junk
List-Id: Development discussions about the libvirt library & tools
	<libvir-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/options/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/libvir-list>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/libvir-list>,
	<mailto:libvir-list-request@redhat.com?subject=subscribe>
Sender: libvir-list-bounces@redhat.com
Errors-To: libvir-list-bounces@redhat.com
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23
Authentication-Results: relay.mimecast.com;
	auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com
X-Mimecast-Spam-Score: 0
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
X-ZohoMail-DKIM: pass (identity @redhat.com)
Content-Type: text/plain; charset="utf-8"

Do not merge this commit.

This commit contains the changes that would be suggested by the
cpu_map sync script (see last commit):

  ./sync_qemu_i386.py ~/git/qemu/target/i386/cpu.c .

Note:
* Some models have "signature" / "vendor" added.
* Models with multiple "signature"s lose all but one.
* Comments are not preserved.
* "stepping" in "signature" is not preseved.
* "decode" is just flat on + on.
* New models: denverton, knightsmill, snowridge
---
 src/cpu_map/x86_486.xml                       |  8 ++
 src/cpu_map/x86_Broadwell-IBRS.xml            | 19 ++++-
 src/cpu_map/x86_Broadwell-noTSX-IBRS.xml      | 19 ++++-
 src/cpu_map/x86_Broadwell-noTSX.xml           | 19 ++++-
 src/cpu_map/x86_Broadwell.xml                 | 18 ++++-
 src/cpu_map/x86_Cascadelake-Server-noTSX.xml  | 20 ++++-
 src/cpu_map/x86_Cascadelake-Server.xml        | 17 +++-
 src/cpu_map/x86_Conroe.xml                    | 10 ++-
 src/cpu_map/x86_Cooperlake.xml                |  8 +-
 src/cpu_map/x86_Denverton.xml                 | 74 +++++++++++++++++
 src/cpu_map/x86_Dhyana.xml                    | 12 ++-
 src/cpu_map/x86_EPYC-IBPB.xml                 | 19 ++++-
 src/cpu_map/x86_EPYC-Rome.xml                 |  9 +++
 src/cpu_map/x86_EPYC.xml                      | 14 +++-
 src/cpu_map/x86_Haswell-IBRS.xml              | 20 ++++-
 src/cpu_map/x86_Haswell-noTSX-IBRS.xml        | 20 ++++-
 src/cpu_map/x86_Haswell-noTSX.xml             | 20 ++++-
 src/cpu_map/x86_Haswell.xml                   | 18 ++++-
 src/cpu_map/x86_Icelake-Client-noTSX.xml      | 14 +++-
 src/cpu_map/x86_Icelake-Client.xml            | 11 ++-
 src/cpu_map/x86_Icelake-Server-noTSX.xml      | 29 ++++++-
 src/cpu_map/x86_Icelake-Server.xml            | 11 ++-
 src/cpu_map/x86_IvyBridge-IBRS.xml            | 13 ++-
 src/cpu_map/x86_IvyBridge.xml                 | 12 ++-
 src/cpu_map/x86_KnightsMill.xml               | 77 ++++++++++++++++++
 src/cpu_map/x86_Nehalem-IBRS.xml              | 14 +++-
 src/cpu_map/x86_Nehalem.xml                   | 13 ++-
 src/cpu_map/x86_Opteron_G1.xml                |  9 ++-
 src/cpu_map/x86_Opteron_G2.xml                | 10 ++-
 src/cpu_map/x86_Opteron_G3.xml                | 10 ++-
 src/cpu_map/x86_Opteron_G4.xml                | 11 ++-
 src/cpu_map/x86_Opteron_G5.xml                | 11 ++-
 src/cpu_map/x86_Penryn.xml                    | 10 ++-
 src/cpu_map/x86_SandyBridge-IBRS.xml          | 14 +++-
 src/cpu_map/x86_SandyBridge.xml               | 13 ++-
 src/cpu_map/x86_Skylake-Client-IBRS.xml       | 16 ++--
 src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml | 18 +++--
 src/cpu_map/x86_Skylake-Client.xml            | 15 ++--
 src/cpu_map/x86_Skylake-Server-IBRS.xml       | 12 ++-
 src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml | 15 +++-
 src/cpu_map/x86_Skylake-Server.xml            | 12 ++-
 src/cpu_map/x86_Snowridge.xml                 | 79 +++++++++++++++++++
 src/cpu_map/x86_Westmere-IBRS.xml             | 13 ++-
 src/cpu_map/x86_Westmere.xml                  | 14 +++-
 src/cpu_map/x86_athlon.xml                    |  8 ++
 src/cpu_map/x86_core2duo.xml                  | 12 ++-
 src/cpu_map/x86_coreduo.xml                   | 10 ++-
 src/cpu_map/x86_kvm32.xml                     |  9 +++
 src/cpu_map/x86_kvm64.xml                     |  9 +++
 src/cpu_map/x86_n270.xml                      | 12 ++-
 src/cpu_map/x86_pentium.xml                   |  9 +++
 src/cpu_map/x86_pentium2.xml                  |  9 +++
 src/cpu_map/x86_pentium3.xml                  |  9 +++
 src/cpu_map/x86_phenom.xml                    | 17 +++-
 src/cpu_map/x86_qemu32.xml                    |  8 ++
 src/cpu_map/x86_qemu64.xml                    | 17 ++--
 56 files changed, 819 insertions(+), 130 deletions(-)
 create mode 100644 src/cpu_map/x86_Denverton.xml
 create mode 100644 src/cpu_map/x86_KnightsMill.xml
 create mode 100644 src/cpu_map/x86_Snowridge.xml

diff --git a/src/cpu_map/x86_486.xml b/src/cpu_map/x86_486.xml
index afc56dacae..acc3ecb7ee 100644
--- a/src/cpu_map/x86_486.xml
+++ b/src/cpu_map/x86_486.xml
@@ -1,6 +1,14 @@
+<!-- extra info from qemu:
+  "model.level": "1"
+  "model.stepping": "0"
+  "model.xlevel": "0"
+  "model.model_id": ""
+-->
 <cpus>
   <model name=3D"486">
     <decode host=3D"on" guest=3D"on"/>
+    <signature family=3D"4" model=3D"8"/>
+    <vendor name=3D"Intel"/>
     <feature name=3D"fpu"/>
     <feature name=3D"pse"/>
     <feature name=3D"vme"/>
diff --git a/src/cpu_map/x86_Broadwell-IBRS.xml b/src/cpu_map/x86_Broadwell=
-IBRS.xml
index 66ff838233..1f3d6bdd91 100644
--- a/src/cpu_map/x86_Broadwell-IBRS.xml
+++ b/src/cpu_map/x86_Broadwell-IBRS.xml
@@ -1,15 +1,22 @@
+<!-- extra info from qemu:
+  "model.level": "0xd"
+  "model.stepping": "2"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Intel Core Processor (Broadwell)"
+  "version.version": "3"
+  "property.model-id": "Intel Core Processor (Broadwell, IBRS)"
+-->
 <cpus>
   <model name=3D"Broadwell-IBRS">
     <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"/>
@@ -20,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 +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"/>
@@ -59,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 2c8f5a9f1b..32acac2693 100644
--- a/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml
@@ -1,15 +1,22 @@
+<!-- extra info from qemu:
+  "model.level": "0xd"
+  "model.stepping": "2"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Intel Core Processor (Broadwell)"
+  "version.version": "4"
+  "property.model-id": "Intel Core Processor (Broadwell, no TSX, IBRS)"
+-->
 <cpus>
   <model name=3D"Broadwell-noTSX-IBRS">
     <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"/>
@@ -20,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"/>
@@ -43,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 +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 4039f2b8d5..7568dd796e 100644
--- a/src/cpu_map/x86_Broadwell-noTSX.xml
+++ b/src/cpu_map/x86_Broadwell-noTSX.xml
@@ -1,15 +1,22 @@
+<!-- extra info from qemu:
+  "model.level": "0xd"
+  "model.stepping": "2"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Intel Core Processor (Broadwell)"
+  "version.version": "2"
+  "property.model-id": "Intel Core Processor (Broadwell, no TSX)"
+-->
 <cpus>
   <model name=3D"Broadwell-noTSX">
     <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"/>
@@ -20,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"/>
@@ -43,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"/>
@@ -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_Broadwell.xml b/src/cpu_map/x86_Broadwell.xml
index cc5cbc5183..1b88ec4887 100644
--- a/src/cpu_map/x86_Broadwell.xml
+++ b/src/cpu_map/x86_Broadwell.xml
@@ -1,15 +1,21 @@
+<!-- extra info from qemu:
+  "model.level": "0xd"
+  "model.stepping": "2"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Intel Core Processor (Broadwell)"
+  "version.version": "1"
+-->
 <cpus>
   <model name=3D"Broadwell">
     <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"/>
@@ -20,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"/>
@@ -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"rtm"/>
@@ -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_Cascadelake-Server-noTSX.xml b/src/cpu_map/x86=
_Cascadelake-Server-noTSX.xml
index f45a7720e9..9b2bcce6f7 100644
--- a/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
+++ b/src/cpu_map/x86_Cascadelake-Server-noTSX.xml
@@ -1,7 +1,15 @@
+<!-- extra info from qemu:
+  "model.level": "0xd"
+  "model.stepping": "6"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Intel Xeon Processor (Cascadelake)"
+  "version.version": "4"
+  "version.note": "ARCH_CAPABILITIES, no TSX"
+-->
 <cpus>
   <model name=3D"Cascadelake-Server-noTSX">
-    <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"/>
@@ -9,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"/>
@@ -32,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"/>
@@ -49,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"/>
@@ -70,6 +83,7 @@
     <feature name=3D"tsc"/>
     <feature name=3D"tsc-deadline"/>
     <feature name=3D"vme"/>
+    <feature name=3D"vmx-eptp-switching"/>
     <feature name=3D"x2apic"/>
     <feature name=3D"xgetbv1"/>
     <feature name=3D"xsave"/>
diff --git a/src/cpu_map/x86_Cascadelake-Server.xml b/src/cpu_map/x86_Casca=
delake-Server.xml
index b6c39153a5..7c397ba004 100644
--- a/src/cpu_map/x86_Cascadelake-Server.xml
+++ b/src/cpu_map/x86_Cascadelake-Server.xml
@@ -1,7 +1,15 @@
+<!-- extra info from qemu:
+  "model.level": "0xd"
+  "model.stepping": "6"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Intel Xeon Processor (Cascadelake)"
+  "version.version": "2"
+  "version.note": "ARCH_CAPABILITIES"
+-->
 <cpus>
   <model name=3D"Cascadelake-Server">
     <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"/>
@@ -9,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 +42,15 @@
     <feature name=3D"fsgsbase"/>
     <feature name=3D"fxsr"/>
     <feature name=3D"hle"/>
+    <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,15 +60,18 @@
     <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"rtm"/>
     <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_Conroe.xml b/src/cpu_map/x86_Conroe.xml
index 6ab92274dd..f4d11f3ddb 100644
--- a/src/cpu_map/x86_Conroe.xml
+++ b/src/cpu_map/x86_Conroe.xml
@@ -1,8 +1,13 @@
+<!-- extra info from qemu:
+  "model.level": "10"
+  "model.stepping": "3"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Intel Celeron_4x0 (Conroe/Merom Class Core 2)"
+-->
 <cpus>
   <model name=3D"Conroe">
     <decode host=3D"on" guest=3D"on"/>
-    <signature family=3D"6" model=3D"15"/> <!-- 0006f0 -->
-    <signature family=3D"6" model=3D"22"/> <!-- 010660 -->
+    <signature family=3D"6" model=3D"15"/>
     <vendor name=3D"Intel"/>
     <feature name=3D"apic"/>
     <feature name=3D"clflush"/>
@@ -31,5 +36,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_Cooperlake.xml b/src/cpu_map/x86_Cooperlake.xml
index a2bac92526..6e7c3780d9 100644
--- a/src/cpu_map/x86_Cooperlake.xml
+++ b/src/cpu_map/x86_Cooperlake.xml
@@ -1,7 +1,13 @@
+<!-- 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">
     <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_Denverton.xml b/src/cpu_map/x86_Denverton.xml
new file mode 100644
index 0000000000..3f356eb876
--- /dev/null
+++ b/src/cpu_map/x86_Denverton.xml
@@ -0,0 +1,74 @@
+<!-- extra info from qemu:
+  "model.level": "21"
+  "model.stepping": "1"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Intel Atom Processor (Denverton)"
+  "version.version": "2"
+  "property.monitor": "off"
+  "version.note": "no MPX, no MONITOR"
+-->
+<cpus>
+  <model name=3D"Denverton">
+    <decode host=3D"on" guest=3D"on"/>
+    <signature family=3D"6" model=3D"95"/>
+    <vendor name=3D"Intel"/>
+    <feature name=3D"3dnowprefetch"/>
+    <feature name=3D"aes"/>
+    <feature name=3D"apic"/>
+    <feature name=3D"arat"/>
+    <feature name=3D"arch-capabilities"/>
+    <feature name=3D"clflush"/>
+    <feature name=3D"clflushopt"/>
+    <feature name=3D"cmov"/>
+    <feature name=3D"cx16"/>
+    <feature name=3D"cx8"/>
+    <feature name=3D"de"/>
+    <feature name=3D"erms"/>
+    <feature name=3D"fpu"/>
+    <feature name=3D"fsgsbase"/>
+    <feature name=3D"fxsr"/>
+    <feature name=3D"lahf_lm"/>
+    <feature name=3D"lm"/>
+    <feature name=3D"mca"/>
+    <feature name=3D"mce"/>
+    <feature name=3D"mmx"/>
+    <feature name=3D"movbe"/>
+    <feature name=3D"msr"/>
+    <feature name=3D"mtrr"/>
+    <feature name=3D"nx"/>
+    <feature name=3D"pae"/>
+    <feature name=3D"pat"/>
+    <feature name=3D"pclmuldq"/>
+    <feature name=3D"pdpe1gb"/>
+    <feature name=3D"pge"/>
+    <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"sha-ni"/>
+    <feature name=3D"skip-l1dfl-vmentry"/>
+    <feature name=3D"smap"/>
+    <feature name=3D"smep"/>
+    <feature name=3D"spec-ctrl"/>
+    <feature name=3D"ssbd"/>
+    <feature name=3D"sse"/>
+    <feature name=3D"sse2"/>
+    <feature name=3D"sse4.1"/>
+    <feature name=3D"sse4.2"/>
+    <feature name=3D"ssse3"/>
+    <feature name=3D"syscall"/>
+    <feature name=3D"tsc"/>
+    <feature name=3D"tsc-deadline"/>
+    <feature name=3D"vme"/>
+    <feature name=3D"x2apic"/>
+    <feature name=3D"xgetbv1"/>
+    <feature name=3D"xsave"/>
+    <feature name=3D"xsavec"/>
+    <feature name=3D"xsaveopt"/>
+  </model>
+</cpus>
diff --git a/src/cpu_map/x86_Dhyana.xml b/src/cpu_map/x86_Dhyana.xml
index 1a00833d02..bbf5c31f14 100644
--- a/src/cpu_map/x86_Dhyana.xml
+++ b/src/cpu_map/x86_Dhyana.xml
@@ -1,7 +1,14 @@
+<!-- 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">
     <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"/>
@@ -33,10 +40,11 @@
     <feature name=3D"misalignsse"/>
     <feature name=3D"mmx"/>
     <feature name=3D"mmxext"/>
-    <feature name=3D"monitor"/>
     <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-IBPB.xml b/src/cpu_map/x86_EPYC-IBPB.xml
index 0ea2a2edfb..db0b29eb8d 100644
--- a/src/cpu_map/x86_EPYC-IBPB.xml
+++ b/src/cpu_map/x86_EPYC-IBPB.xml
@@ -1,7 +1,17 @@
+<!-- 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"
+  "model.use_epyc_apic_id_encoding": "1"
+  "version.version": "3"
+  "property.model-id": "AMD EPYC Processor"
+-->
 <cpus>
   <model name=3D"EPYC-IBPB">
     <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"/>
@@ -15,6 +25,7 @@
     <feature name=3D"bmi2"/>
     <feature name=3D"clflush"/>
     <feature name=3D"clflushopt"/>
+    <feature name=3D"clzero"/>
     <feature name=3D"cmov"/>
     <feature name=3D"cr8legacy"/>
     <feature name=3D"cx16"/>
@@ -34,16 +45,18 @@
     <feature name=3D"misalignsse"/>
     <feature name=3D"mmx"/>
     <feature name=3D"mmxext"/>
-    <feature name=3D"monitor"/>
     <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"/>
     <feature name=3D"pat"/>
     <feature name=3D"pclmuldq"/>
     <feature name=3D"pdpe1gb"/>
+    <feature name=3D"perfctr-core"/>
     <feature name=3D"pge"/>
     <feature name=3D"pni"/>
     <feature name=3D"popcnt"/>
@@ -69,6 +82,8 @@
     <feature name=3D"xgetbv1"/>
     <feature name=3D"xsave"/>
     <feature name=3D"xsavec"/>
+    <feature name=3D"xsaveerptr"/>
     <feature name=3D"xsaveopt"/>
+    <feature name=3D"xsaves"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_EPYC-Rome.xml b/src/cpu_map/x86_EPYC-Rome.xml
index c38fb760a8..26ef2aa504 100644
--- a/src/cpu_map/x86_EPYC-Rome.xml
+++ b/src/cpu_map/x86_EPYC-Rome.xml
@@ -1,3 +1,11 @@
+<!-- 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"
+  "model.use_epyc_apic_id_encoding": "1"
+-->
 <cpus>
   <model name=3D"EPYC-Rome">
     <decode host=3D"on" guest=3D"on"/>
@@ -79,5 +87,6 @@
     <feature name=3D"xsavec"/>
     <feature name=3D"xsaveerptr"/>
     <feature name=3D"xsaveopt"/>
+    <feature name=3D"xsaves"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_EPYC.xml b/src/cpu_map/x86_EPYC.xml
index 36462a0dda..5ea9c8845f 100644
--- a/src/cpu_map/x86_EPYC.xml
+++ b/src/cpu_map/x86_EPYC.xml
@@ -1,7 +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"
+  "model.use_epyc_apic_id_encoding": "1"
+  "version.version": "1"
+-->
 <cpus>
   <model name=3D"EPYC">
     <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"/>
@@ -33,10 +42,11 @@
     <feature name=3D"misalignsse"/>
     <feature name=3D"mmx"/>
     <feature name=3D"mmxext"/>
-    <feature name=3D"monitor"/>
     <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_Haswell-IBRS.xml b/src/cpu_map/x86_Haswell-IBR=
S.xml
index 51052a16de..8a831f84dc 100644
--- a/src/cpu_map/x86_Haswell-IBRS.xml
+++ b/src/cpu_map/x86_Haswell-IBRS.xml
@@ -1,13 +1,21 @@
+<!-- extra info from qemu:
+  "model.level": "0xd"
+  "model.stepping": "4"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Intel Core Processor (Haswell)"
+  "version.version": "3"
+  "property.stepping": "4"
+  "property.model-id": "Intel Core Processor (Haswell, IBRS)"
+-->
 <cpus>
   <model name=3D"Haswell-IBRS">
     <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"/>
@@ -18,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 +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"/>
@@ -55,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 8db662a267..47d653fa9b 100644
--- a/src/cpu_map/x86_Haswell-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Haswell-noTSX-IBRS.xml
@@ -1,13 +1,21 @@
+<!-- extra info from qemu:
+  "model.level": "0xd"
+  "model.stepping": "4"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Intel Core Processor (Haswell)"
+  "version.version": "4"
+  "property.stepping": "1"
+  "property.model-id": "Intel Core Processor (Haswell, no TSX, IBRS)"
+-->
 <cpus>
   <model name=3D"Haswell-noTSX-IBRS">
     <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"/>
@@ -18,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"/>
@@ -41,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 +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 2379564011..92c1ad5928 100644
--- a/src/cpu_map/x86_Haswell-noTSX.xml
+++ b/src/cpu_map/x86_Haswell-noTSX.xml
@@ -1,13 +1,21 @@
+<!-- extra info from qemu:
+  "model.level": "0xd"
+  "model.stepping": "4"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Intel Core Processor (Haswell)"
+  "version.version": "2"
+  "property.stepping": "1"
+  "property.model-id": "Intel Core Processor (Haswell, no TSX)"
+-->
 <cpus>
   <model name=3D"Haswell-noTSX">
     <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"/>
@@ -18,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"/>
@@ -41,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"/>
@@ -52,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 6670303b8b..cc2e2d9343 100644
--- a/src/cpu_map/x86_Haswell.xml
+++ b/src/cpu_map/x86_Haswell.xml
@@ -1,13 +1,19 @@
+<!-- extra info from qemu:
+  "model.level": "0xd"
+  "model.stepping": "4"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Intel Core Processor (Haswell)"
+  "version.version": "1"
+-->
 <cpus>
   <model name=3D"Haswell">
     <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"/>
@@ -18,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"/>
@@ -42,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"/>
@@ -54,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-Client-noTSX.xml b/src/cpu_map/x86_Ice=
lake-Client-noTSX.xml
index 57bd2c2587..3f3243f15f 100644
--- a/src/cpu_map/x86_Icelake-Client-noTSX.xml
+++ b/src/cpu_map/x86_Icelake-Client-noTSX.xml
@@ -1,7 +1,15 @@
+<!-- extra info from qemu:
+  "model.level": "0xd"
+  "model.stepping": "0"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Intel Core Processor (Icelake)"
+  "version.version": "2"
+  "version.note": "no TSX"
+-->
 <cpus>
   <model name=3D"Icelake-Client-noTSX">
-    <decode host=3D"on" guest=3D"off"/>
-    <signature family=3D"6" model=3D"126"/> <!-- 0706e0 -->
+    <decode host=3D"on" guest=3D"on"/>
+    <signature family=3D"6" model=3D"126"/>
     <vendor name=3D"Intel"/>
     <feature name=3D"3dnowprefetch"/>
     <feature name=3D"abm"/>
@@ -30,7 +38,6 @@
     <feature name=3D"fsgsbase"/>
     <feature name=3D"fxsr"/>
     <feature name=3D"gfni"/>
-    <feature name=3D"intel-pt"/>
     <feature name=3D"invpcid"/>
     <feature name=3D"lahf_lm"/>
     <feature name=3D"lm"/>
@@ -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"/>
diff --git a/src/cpu_map/x86_Icelake-Client.xml b/src/cpu_map/x86_Icelake-C=
lient.xml
index c927ac1993..f6b80b9165 100644
--- a/src/cpu_map/x86_Icelake-Client.xml
+++ b/src/cpu_map/x86_Icelake-Client.xml
@@ -1,7 +1,14 @@
+<!-- extra info from qemu:
+  "model.level": "0xd"
+  "model.stepping": "0"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Intel Core Processor (Icelake)"
+  "version.version": "1"
+-->
 <cpus>
   <model name=3D"Icelake-Client">
     <decode host=3D"on" guest=3D"on"/>
-    <signature family=3D"6" model=3D"126"/> <!-- 0706e0 -->
+    <signature family=3D"6" model=3D"126"/>
     <vendor name=3D"Intel"/>
     <feature name=3D"3dnowprefetch"/>
     <feature name=3D"abm"/>
@@ -31,7 +38,6 @@
     <feature name=3D"fxsr"/>
     <feature name=3D"gfni"/>
     <feature name=3D"hle"/>
-    <feature name=3D"intel-pt"/>
     <feature name=3D"invpcid"/>
     <feature name=3D"lahf_lm"/>
     <feature name=3D"lm"/>
@@ -39,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"/>
diff --git a/src/cpu_map/x86_Icelake-Server-noTSX.xml b/src/cpu_map/x86_Ice=
lake-Server-noTSX.xml
index 3ed475bb32..74d47dc6c2 100644
--- a/src/cpu_map/x86_Icelake-Server-noTSX.xml
+++ b/src/cpu_map/x86_Icelake-Server-noTSX.xml
@@ -1,7 +1,16 @@
+<!-- extra info from qemu:
+  "model.level": "0xd"
+  "model.stepping": "0"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Intel Xeon Processor (Icelake)"
+  "version.version": "4"
+  "version.note": "no TSX"
+  "property.model": "106"
+-->
 <cpus>
   <model name=3D"Icelake-Server-noTSX">
-    <decode host=3D"on" guest=3D"off"/>
-    <signature family=3D"6" model=3D"134"/> <!-- 080660 -->
+    <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"/>
@@ -9,6 +18,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"avx512-vpopcntdq"/>
@@ -17,6 +27,7 @@
     <feature name=3D"avx512cd"/>
     <feature name=3D"avx512dq"/>
     <feature name=3D"avx512f"/>
+    <feature name=3D"avx512ifma"/>
     <feature name=3D"avx512vbmi"/>
     <feature name=3D"avx512vbmi2"/>
     <feature name=3D"avx512vl"/>
@@ -35,18 +46,19 @@
     <feature name=3D"fma"/>
     <feature name=3D"fpu"/>
     <feature name=3D"fsgsbase"/>
+    <feature name=3D"fsrm"/>
     <feature name=3D"fxsr"/>
     <feature name=3D"gfni"/>
-    <feature name=3D"intel-pt"/>
+    <feature name=3D"ibrs-all"/>
     <feature name=3D"invpcid"/>
     <feature name=3D"la57"/>
     <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"/>
@@ -59,12 +71,17 @@
     <feature name=3D"pku"/>
     <feature name=3D"pni"/>
     <feature name=3D"popcnt"/>
+    <feature name=3D"pschange-mc-no"/>
     <feature name=3D"pse"/>
     <feature name=3D"pse36"/>
+    <feature name=3D"rdctl-no"/>
+    <feature name=3D"rdpid"/>
     <feature name=3D"rdrand"/>
     <feature name=3D"rdseed"/>
     <feature name=3D"rdtscp"/>
     <feature name=3D"sep"/>
+    <feature name=3D"sha-ni"/>
+    <feature name=3D"skip-l1dfl-vmentry"/>
     <feature name=3D"smap"/>
     <feature name=3D"smep"/>
     <feature name=3D"spec-ctrl"/>
@@ -75,11 +92,15 @@
     <feature name=3D"sse4.2"/>
     <feature name=3D"ssse3"/>
     <feature name=3D"syscall"/>
+    <feature name=3D"taa-no"/>
     <feature name=3D"tsc"/>
     <feature name=3D"tsc-deadline"/>
     <feature name=3D"umip"/>
     <feature name=3D"vaes"/>
     <feature name=3D"vme"/>
+    <feature name=3D"vmx-eptp-switching"/>
+    <feature name=3D"vmx-pml"/>
+    <feature name=3D"vmx-rdseed-exit"/>
     <feature name=3D"vpclmulqdq"/>
     <feature name=3D"wbnoinvd"/>
     <feature name=3D"x2apic"/>
diff --git a/src/cpu_map/x86_Icelake-Server.xml b/src/cpu_map/x86_Icelake-S=
erver.xml
index 19c7da10b0..e50b92ccf4 100644
--- a/src/cpu_map/x86_Icelake-Server.xml
+++ b/src/cpu_map/x86_Icelake-Server.xml
@@ -1,7 +1,14 @@
+<!-- extra info from qemu:
+  "model.level": "0xd"
+  "model.stepping": "0"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Intel Xeon Processor (Icelake)"
+  "version.version": "1"
+-->
 <cpus>
   <model name=3D"Icelake-Server">
     <decode host=3D"on" guest=3D"on"/>
-    <signature family=3D"6" model=3D"134"/> <!-- 080660 -->
+    <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"fxsr"/>
     <feature name=3D"gfni"/>
     <feature name=3D"hle"/>
-    <feature name=3D"intel-pt"/>
     <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_IvyBridge-IBRS.xml b/src/cpu_map/x86_IvyBridge=
-IBRS.xml
index cd37b62cff..aa84d43eb0 100644
--- a/src/cpu_map/x86_IvyBridge-IBRS.xml
+++ b/src/cpu_map/x86_IvyBridge-IBRS.xml
@@ -1,11 +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)"
+  "version.version": "2"
+  "property.model-id": "Intel Xeon E3-12xx v2 (Ivy Bridge, IBRS)"
+-->
 <cpus>
   <model name=3D"IvyBridge-IBRS">
     <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 +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 1718e14e13..8ce1464eb4 100644
--- a/src/cpu_map/x86_IvyBridge.xml
+++ b/src/cpu_map/x86_IvyBridge.xml
@@ -1,11 +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)"
+  "version.version": "1"
+-->
 <cpus>
   <model name=3D"IvyBridge">
     <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"/>
@@ -48,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_KnightsMill.xml b/src/cpu_map/x86_KnightsMill.=
xml
new file mode 100644
index 0000000000..13e68efa84
--- /dev/null
+++ b/src/cpu_map/x86_KnightsMill.xml
@@ -0,0 +1,77 @@
+<!-- extra info from qemu:
+  "model.level": "0xd"
+  "model.stepping": "0"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Intel Xeon Phi Processor (Knights Mill)"
+-->
+<cpus>
+  <model name=3D"KnightsMill">
+    <decode host=3D"on" guest=3D"on"/>
+    <signature family=3D"6" model=3D"133"/>
+    <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"avx512-4fmaps"/>
+    <feature name=3D"avx512-4vnniw"/>
+    <feature name=3D"avx512-vpopcntdq"/>
+    <feature name=3D"avx512cd"/>
+    <feature name=3D"avx512er"/>
+    <feature name=3D"avx512f"/>
+    <feature name=3D"avx512pf"/>
+    <feature name=3D"bmi1"/>
+    <feature name=3D"bmi2"/>
+    <feature name=3D"clflush"/>
+    <feature name=3D"cmov"/>
+    <feature name=3D"cx16"/>
+    <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"/>
+    <feature name=3D"fxsr"/>
+    <feature name=3D"lahf_lm"/>
+    <feature name=3D"lm"/>
+    <feature name=3D"mca"/>
+    <feature name=3D"mce"/>
+    <feature name=3D"mmx"/>
+    <feature name=3D"movbe"/>
+    <feature name=3D"msr"/>
+    <feature name=3D"mtrr"/>
+    <feature name=3D"nx"/>
+    <feature name=3D"pae"/>
+    <feature name=3D"pat"/>
+    <feature name=3D"pclmuldq"/>
+    <feature name=3D"pdpe1gb"/>
+    <feature name=3D"pge"/>
+    <feature name=3D"pni"/>
+    <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"/>
+    <feature name=3D"smep"/>
+    <feature name=3D"ss"/>
+    <feature name=3D"sse"/>
+    <feature name=3D"sse2"/>
+    <feature name=3D"sse4.1"/>
+    <feature name=3D"sse4.2"/>
+    <feature name=3D"ssse3"/>
+    <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_Nehalem-IBRS.xml b/src/cpu_map/x86_Nehalem-IBR=
S.xml
index 9f10bf1b01..d72d8d97ce 100644
--- a/src/cpu_map/x86_Nehalem-IBRS.xml
+++ b/src/cpu_map/x86_Nehalem-IBRS.xml
@@ -1,10 +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)"
+  "version.version": "2"
+  "property.model-id": "Intel Core i7 9xx (Nehalem Core i7, IBRS update)"
+-->
 <cpus>
   <model name=3D"Nehalem-IBRS">
     <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 +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 bfa2224794..4a0a1c3cad 100644
--- a/src/cpu_map/x86_Nehalem.xml
+++ b/src/cpu_map/x86_Nehalem.xml
@@ -1,10 +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)"
+  "version.version": "1"
+-->
 <cpus>
   <model name=3D"Nehalem">
     <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"/>
@@ -37,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_Opteron_G1.xml b/src/cpu_map/x86_Opteron_G1.xml
index cbb28aad84..56c5a7ba6a 100644
--- a/src/cpu_map/x86_Opteron_G1.xml
+++ b/src/cpu_map/x86_Opteron_G1.xml
@@ -1,7 +1,13 @@
+<!-- extra info from qemu:
+  "model.level": "5"
+  "model.stepping": "1"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "AMD Opteron 240 (Gen 1 Class Opteron)"
+-->
 <cpus>
   <model name=3D"Opteron_G1">
     <decode host=3D"on" guest=3D"on"/>
-    <signature family=3D"15" model=3D"6"/> <!-- 100e60 -->
+    <signature family=3D"15" model=3D"6"/>
     <vendor name=3D"AMD"/>
     <feature name=3D"apic"/>
     <feature name=3D"clflush"/>
@@ -28,5 +34,6 @@
     <feature name=3D"sse2"/>
     <feature name=3D"syscall"/>
     <feature name=3D"tsc"/>
+    <feature name=3D"vme"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Opteron_G2.xml b/src/cpu_map/x86_Opteron_G2.xml
index 4888d8ec4b..4d894ed72c 100644
--- a/src/cpu_map/x86_Opteron_G2.xml
+++ b/src/cpu_map/x86_Opteron_G2.xml
@@ -1,7 +1,13 @@
+<!-- extra info from qemu:
+  "model.level": "5"
+  "model.stepping": "1"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "AMD Opteron 22xx (Gen 2 Class Opteron)"
+-->
 <cpus>
   <model name=3D"Opteron_G2">
     <decode host=3D"on" guest=3D"on"/>
-    <signature family=3D"15" model=3D"6"/> <!-- 100e60 -->
+    <signature family=3D"15" model=3D"6"/>
     <vendor name=3D"AMD"/>
     <feature name=3D"apic"/>
     <feature name=3D"clflush"/>
@@ -25,12 +31,12 @@
     <feature name=3D"pni"/>
     <feature name=3D"pse"/>
     <feature name=3D"pse36"/>
-    <feature name=3D"rdtscp"/>
     <feature name=3D"sep"/>
     <feature name=3D"sse"/>
     <feature name=3D"sse2"/>
     <feature name=3D"svm"/>
     <feature name=3D"syscall"/>
     <feature name=3D"tsc"/>
+    <feature name=3D"vme"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Opteron_G3.xml b/src/cpu_map/x86_Opteron_G3.xml
index 7dd0eb99ed..7f2929a503 100644
--- a/src/cpu_map/x86_Opteron_G3.xml
+++ b/src/cpu_map/x86_Opteron_G3.xml
@@ -1,7 +1,13 @@
+<!-- extra info from qemu:
+  "model.level": "5"
+  "model.stepping": "3"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "AMD Opteron 23xx (Gen 3 Class Opteron)"
+-->
 <cpus>
   <model name=3D"Opteron_G3">
     <decode host=3D"on" guest=3D"on"/>
-    <signature family=3D"15" model=3D"6"/> <!-- 100e60 -->
+    <signature family=3D"16" model=3D"2"/>
     <vendor name=3D"AMD"/>
     <feature name=3D"abm"/>
     <feature name=3D"apic"/>
@@ -18,7 +24,6 @@
     <feature name=3D"mce"/>
     <feature name=3D"misalignsse"/>
     <feature name=3D"mmx"/>
-    <feature name=3D"monitor"/>
     <feature name=3D"msr"/>
     <feature name=3D"mtrr"/>
     <feature name=3D"nx"/>
@@ -37,5 +42,6 @@
     <feature name=3D"svm"/>
     <feature name=3D"syscall"/>
     <feature name=3D"tsc"/>
+    <feature name=3D"vme"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_Opteron_G4.xml b/src/cpu_map/x86_Opteron_G4.xml
index 2b6e986839..b61df726a5 100644
--- a/src/cpu_map/x86_Opteron_G4.xml
+++ b/src/cpu_map/x86_Opteron_G4.xml
@@ -1,7 +1,13 @@
+<!-- extra info from qemu:
+  "model.level": "0xd"
+  "model.stepping": "2"
+  "model.xlevel": "0x8000001A"
+  "model.model_id": "AMD Opteron 62xx class CPU"
+-->
 <cpus>
   <model name=3D"Opteron_G4">
     <decode host=3D"on" guest=3D"on"/>
-    <signature family=3D"21" model=3D"1"/> <!-- 600f10 -->
+    <signature family=3D"21" model=3D"1"/>
     <vendor name=3D"AMD"/>
     <feature name=3D"3dnowprefetch"/>
     <feature name=3D"abm"/>
@@ -24,6 +30,8 @@
     <feature name=3D"mmx"/>
     <feature name=3D"msr"/>
     <feature name=3D"mtrr"/>
+    <feature name=3D"npt"/>
+    <feature name=3D"nrip-save"/>
     <feature name=3D"nx"/>
     <feature name=3D"pae"/>
     <feature name=3D"pat"/>
@@ -45,6 +53,7 @@
     <feature name=3D"svm"/>
     <feature name=3D"syscall"/>
     <feature name=3D"tsc"/>
+    <feature name=3D"vme"/>
     <feature name=3D"xop"/>
     <feature name=3D"xsave"/>
   </model>
diff --git a/src/cpu_map/x86_Opteron_G5.xml b/src/cpu_map/x86_Opteron_G5.xml
index 9827161a54..970eb90fcc 100644
--- a/src/cpu_map/x86_Opteron_G5.xml
+++ b/src/cpu_map/x86_Opteron_G5.xml
@@ -1,7 +1,13 @@
+<!-- extra info from qemu:
+  "model.level": "0xd"
+  "model.stepping": "0"
+  "model.xlevel": "0x8000001A"
+  "model.model_id": "AMD Opteron 63xx class CPU"
+-->
 <cpus>
   <model name=3D"Opteron_G5">
     <decode host=3D"on" guest=3D"on"/>
-    <signature family=3D"21" model=3D"2"/> <!-- 600f20 -->
+    <signature family=3D"21" model=3D"2"/>
     <vendor name=3D"AMD"/>
     <feature name=3D"3dnowprefetch"/>
     <feature name=3D"abm"/>
@@ -26,6 +32,8 @@
     <feature name=3D"mmx"/>
     <feature name=3D"msr"/>
     <feature name=3D"mtrr"/>
+    <feature name=3D"npt"/>
+    <feature name=3D"nrip-save"/>
     <feature name=3D"nx"/>
     <feature name=3D"pae"/>
     <feature name=3D"pat"/>
@@ -48,6 +56,7 @@
     <feature name=3D"syscall"/>
     <feature name=3D"tbm"/>
     <feature name=3D"tsc"/>
+    <feature name=3D"vme"/>
     <feature name=3D"xop"/>
     <feature name=3D"xsave"/>
   </model>
diff --git a/src/cpu_map/x86_Penryn.xml b/src/cpu_map/x86_Penryn.xml
index 9b756f758b..d306be84d6 100644
--- a/src/cpu_map/x86_Penryn.xml
+++ b/src/cpu_map/x86_Penryn.xml
@@ -1,8 +1,13 @@
+<!-- extra info from qemu:
+  "model.level": "10"
+  "model.stepping": "3"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Intel Core 2 Duo P9xxx (Penryn Class Core 2)"
+-->
 <cpus>
   <model name=3D"Penryn">
     <decode host=3D"on" guest=3D"on"/>
-    <signature family=3D"6" model=3D"23"/> <!-- 010670 -->
-    <signature family=3D"6" model=3D"29"/> <!-- 0106d0 -->
+    <signature family=3D"6" model=3D"23"/>
     <vendor name=3D"Intel"/>
     <feature name=3D"apic"/>
     <feature name=3D"clflush"/>
@@ -33,5 +38,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 995b00db11..0f73113566 100644
--- a/src/cpu_map/x86_SandyBridge-IBRS.xml
+++ b/src/cpu_map/x86_SandyBridge-IBRS.xml
@@ -1,11 +1,19 @@
+<!-- extra info from qemu:
+  "model.level": "0xd"
+  "model.stepping": "1"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Intel Xeon E312xx (Sandy Bridge)"
+  "version.version": "2"
+  "property.model-id": "Intel Xeon E312xx (Sandy Bridge, IBRS update)"
+-->
 <cpus>
   <model name=3D"SandyBridge-IBRS">
     <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 +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 c4e2f28ec0..a47ffe1bc6 100644
--- a/src/cpu_map/x86_SandyBridge.xml
+++ b/src/cpu_map/x86_SandyBridge.xml
@@ -1,11 +1,18 @@
+<!-- extra info from qemu:
+  "model.level": "0xd"
+  "model.stepping": "1"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Intel Xeon E312xx (Sandy Bridge)"
+  "version.version": "1"
+-->
 <cpus>
   <model name=3D"SandyBridge">
     <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"/>
@@ -40,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_Skylake-Client-IBRS.xml b/src/cpu_map/x86_Skyl=
ake-Client-IBRS.xml
index 768221d5c6..bf5de2ce64 100644
--- a/src/cpu_map/x86_Skylake-Client-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Client-IBRS.xml
@@ -1,12 +1,15 @@
+<!-- extra info from qemu:
+  "model.level": "0xd"
+  "model.stepping": "3"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Intel Core Processor (Skylake)"
+  "version.version": "2"
+  "property.model-id": "Intel Core Processor (Skylake, IBRS)"
+-->
 <cpus>
   <model name=3D"Skylake-Client-IBRS">
     <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"/>
@@ -37,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 2df69661a4..c5d53bb33a 100644
--- a/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
@@ -1,12 +1,15 @@
+<!-- extra info from qemu:
+  "model.level": "0xd"
+  "model.stepping": "3"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Intel Core Processor (Skylake)"
+  "version.version": "3"
+  "property.model-id": "Intel Core Processor (Skylake, IBRS, no TSX)"
+-->
 <cpus>
   <model name=3D"Skylake-Client-noTSX-IBRS">
-    <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"/>
@@ -36,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 d0e034ee90..36f16e9698 100644
--- a/src/cpu_map/x86_Skylake-Client.xml
+++ b/src/cpu_map/x86_Skylake-Client.xml
@@ -1,12 +1,14 @@
+<!-- extra info from qemu:
+  "model.level": "0xd"
+  "model.stepping": "3"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Intel Core Processor (Skylake)"
+  "version.version": "1"
+-->
 <cpus>
   <model name=3D"Skylake-Client">
     <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"/>
@@ -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-Server-IBRS.xml b/src/cpu_map/x86_Skyl=
ake-Server-IBRS.xml
index 47cdc5541f..6a7915806c 100644
--- a/src/cpu_map/x86_Skylake-Server-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Server-IBRS.xml
@@ -1,7 +1,15 @@
+<!-- extra info from qemu:
+  "model.level": "0xd"
+  "model.stepping": "4"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Intel Xeon Processor (Skylake)"
+  "version.version": "2"
+  "property.model-id": "Intel Xeon Processor (Skylake, IBRS)"
+-->
 <cpus>
   <model name=3D"Skylake-Server-IBRS">
     <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"/>
@@ -38,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"/>
@@ -48,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 5338f6bcf8..5ef7df5e40 100644
--- a/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
+++ b/src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml
@@ -1,7 +1,15 @@
+<!-- extra info from qemu:
+  "model.level": "0xd"
+  "model.stepping": "4"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Intel Xeon Processor (Skylake)"
+  "version.version": "4"
+  "property.model-id": "Intel Xeon Processor (Skylake, IBRS, no TSX)"
+-->
 <cpus>
   <model name=3D"Skylake-Server-noTSX-IBRS">
-    <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"/>
@@ -37,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"/>
@@ -47,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"/>
@@ -67,6 +75,7 @@
     <feature name=3D"tsc"/>
     <feature name=3D"tsc-deadline"/>
     <feature name=3D"vme"/>
+    <feature name=3D"vmx-eptp-switching"/>
     <feature name=3D"x2apic"/>
     <feature name=3D"xgetbv1"/>
     <feature name=3D"xsave"/>
diff --git a/src/cpu_map/x86_Skylake-Server.xml b/src/cpu_map/x86_Skylake-S=
erver.xml
index a608573740..ed414f9f3b 100644
--- a/src/cpu_map/x86_Skylake-Server.xml
+++ b/src/cpu_map/x86_Skylake-Server.xml
@@ -1,7 +1,14 @@
+<!-- extra info from qemu:
+  "model.level": "0xd"
+  "model.stepping": "4"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Intel Xeon Processor (Skylake)"
+  "version.version": "1"
+-->
 <cpus>
   <model name=3D"Skylake-Server">
     <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"/>
@@ -19,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"/>
@@ -38,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"/>
@@ -48,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
new file mode 100644
index 0000000000..5e43d59ac1
--- /dev/null
+++ b/src/cpu_map/x86_Snowridge.xml
@@ -0,0 +1,79 @@
+<!-- extra info from qemu:
+  "model.level": "27"
+  "model.stepping": "1"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Intel Atom Processor (SnowRidge)"
+  "version.version": "2"
+  "property.model-id": "Intel Atom Processor (Snowridge, no MPX)"
+-->
+<cpus>
+  <model name=3D"Snowridge">
+    <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"aes"/>
+    <feature name=3D"apic"/>
+    <feature name=3D"arat"/>
+    <feature name=3D"arch-capabilities"/>
+    <feature name=3D"cldemote"/>
+    <feature name=3D"clflush"/>
+    <feature name=3D"clflushopt"/>
+    <feature name=3D"clwb"/>
+    <feature name=3D"cmov"/>
+    <feature name=3D"core-capability"/>
+    <feature name=3D"cx16"/>
+    <feature name=3D"cx8"/>
+    <feature name=3D"de"/>
+    <feature name=3D"erms"/>
+    <feature name=3D"fpu"/>
+    <feature name=3D"fsgsbase"/>
+    <feature name=3D"fxsr"/>
+    <feature name=3D"gfni"/>
+    <feature name=3D"lahf_lm"/>
+    <feature name=3D"lm"/>
+    <feature name=3D"mca"/>
+    <feature name=3D"mce"/>
+    <feature name=3D"mmx"/>
+    <feature name=3D"movbe"/>
+    <feature name=3D"movdir64b"/>
+    <feature name=3D"movdiri"/>
+    <feature name=3D"msr"/>
+    <feature name=3D"mtrr"/>
+    <feature name=3D"nx"/>
+    <feature name=3D"pae"/>
+    <feature name=3D"pat"/>
+    <feature name=3D"pclmuldq"/>
+    <feature name=3D"pdpe1gb"/>
+    <feature name=3D"pge"/>
+    <feature name=3D"pni"/>
+    <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"/>
+    <feature name=3D"sha-ni"/>
+    <feature name=3D"smap"/>
+    <feature name=3D"smep"/>
+    <feature name=3D"spec-ctrl"/>
+    <feature name=3D"split-lock-detect"/>
+    <feature name=3D"ssbd"/>
+    <feature name=3D"sse"/>
+    <feature name=3D"sse2"/>
+    <feature name=3D"sse4.1"/>
+    <feature name=3D"sse4.2"/>
+    <feature name=3D"ssse3"/>
+    <feature name=3D"syscall"/>
+    <feature name=3D"tsc"/>
+    <feature name=3D"tsc-deadline"/>
+    <feature name=3D"umip"/>
+    <feature name=3D"vme"/>
+    <feature name=3D"x2apic"/>
+    <feature name=3D"xgetbv1"/>
+    <feature name=3D"xsave"/>
+    <feature name=3D"xsavec"/>
+    <feature name=3D"xsaveopt"/>
+  </model>
+</cpus>
diff --git a/src/cpu_map/x86_Westmere-IBRS.xml b/src/cpu_map/x86_Westmere-I=
BRS.xml
index 2e4bfd171d..a3ab58afb2 100644
--- a/src/cpu_map/x86_Westmere-IBRS.xml
+++ b/src/cpu_map/x86_Westmere-IBRS.xml
@@ -1,10 +1,19 @@
+<!-- extra info from qemu:
+  "model.level": "11"
+  "model.stepping": "1"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Westmere E56xx/L56xx/X56xx (Nehalem-C)"
+  "version.version": "2"
+  "property.model-id": "Westmere E56xx/L56xx/X56xx (IBRS update)"
+-->
 <cpus>
   <model name=3D"Westmere-IBRS">
     <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"/>
@@ -22,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"/>
@@ -36,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 259b6c75ee..72bf717092 100644
--- a/src/cpu_map/x86_Westmere.xml
+++ b/src/cpu_map/x86_Westmere.xml
@@ -1,12 +1,18 @@
+<!-- extra info from qemu:
+  "model.level": "11"
+  "model.stepping": "1"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Westmere E56xx/L56xx/X56xx (Nehalem-C)"
+  "version.version": "1"
+-->
 <cpus>
   <model name=3D"Westmere">
     <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"/>
@@ -24,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"/>
@@ -37,5 +44,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_athlon.xml b/src/cpu_map/x86_athlon.xml
index 7ae992c491..ae25605445 100644
--- a/src/cpu_map/x86_athlon.xml
+++ b/src/cpu_map/x86_athlon.xml
@@ -1,6 +1,13 @@
+<!-- extra info from qemu:
+  "model.level": "2"
+  "model.stepping": "3"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "QEMU Virtual CPU version  QEMU_HW_VERSION"
+-->
 <cpus>
   <model name=3D"athlon">
     <decode host=3D"on" guest=3D"on"/>
+    <signature family=3D"6" model=3D"2"/>
     <vendor name=3D"AMD"/>
     <feature name=3D"3dnow"/>
     <feature name=3D"3dnowext"/>
@@ -10,6 +17,7 @@
     <feature name=3D"de"/>
     <feature name=3D"fpu"/>
     <feature name=3D"fxsr"/>
+    <feature name=3D"mca"/>
     <feature name=3D"mce"/>
     <feature name=3D"mmx"/>
     <feature name=3D"mmxext"/>
diff --git a/src/cpu_map/x86_core2duo.xml b/src/cpu_map/x86_core2duo.xml
index e22b183b42..796eca2cdb 100644
--- a/src/cpu_map/x86_core2duo.xml
+++ b/src/cpu_map/x86_core2duo.xml
@@ -1,19 +1,28 @@
+<!-- extra info from qemu:
+  "model.level": "10"
+  "model.stepping": "11"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Intel(R) Core(TM)2 Duo CPU     T7700  @ 2.40GHz"
+-->
 <cpus>
   <model name=3D"core2duo">
     <decode host=3D"on" guest=3D"on"/>
+    <signature family=3D"6" model=3D"15"/>
     <vendor name=3D"Intel"/>
+    <feature name=3D"acpi"/>
     <feature name=3D"apic"/>
     <feature name=3D"clflush"/>
     <feature name=3D"cmov"/>
+    <feature name=3D"cx16"/>
     <feature name=3D"cx8"/>
     <feature name=3D"de"/>
     <feature name=3D"fpu"/>
     <feature name=3D"fxsr"/>
+    <feature name=3D"lahf_lm"/>
     <feature name=3D"lm"/>
     <feature name=3D"mca"/>
     <feature name=3D"mce"/>
     <feature name=3D"mmx"/>
-    <feature name=3D"monitor"/>
     <feature name=3D"msr"/>
     <feature name=3D"mtrr"/>
     <feature name=3D"nx"/>
@@ -24,6 +33,7 @@
     <feature name=3D"pse"/>
     <feature name=3D"pse36"/>
     <feature name=3D"sep"/>
+    <feature name=3D"ss"/>
     <feature name=3D"sse"/>
     <feature name=3D"sse2"/>
     <feature name=3D"ssse3"/>
diff --git a/src/cpu_map/x86_coreduo.xml b/src/cpu_map/x86_coreduo.xml
index d9888beb51..e139a88404 100644
--- a/src/cpu_map/x86_coreduo.xml
+++ b/src/cpu_map/x86_coreduo.xml
@@ -1,7 +1,15 @@
+<!-- extra info from qemu:
+  "model.level": "10"
+  "model.stepping": "8"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Genuine Intel(R) CPU           T2600  @ 2.16GHz"
+-->
 <cpus>
   <model name=3D"coreduo">
     <decode host=3D"on" guest=3D"on"/>
+    <signature family=3D"6" model=3D"14"/>
     <vendor name=3D"Intel"/>
+    <feature name=3D"acpi"/>
     <feature name=3D"apic"/>
     <feature name=3D"clflush"/>
     <feature name=3D"cmov"/>
@@ -12,7 +20,6 @@
     <feature name=3D"mca"/>
     <feature name=3D"mce"/>
     <feature name=3D"mmx"/>
-    <feature name=3D"monitor"/>
     <feature name=3D"msr"/>
     <feature name=3D"mtrr"/>
     <feature name=3D"nx"/>
@@ -22,6 +29,7 @@
     <feature name=3D"pni"/>
     <feature name=3D"pse"/>
     <feature name=3D"sep"/>
+    <feature name=3D"ss"/>
     <feature name=3D"sse"/>
     <feature name=3D"sse2"/>
     <feature name=3D"tsc"/>
diff --git a/src/cpu_map/x86_kvm32.xml b/src/cpu_map/x86_kvm32.xml
index c35985f274..c5c958626a 100644
--- a/src/cpu_map/x86_kvm32.xml
+++ b/src/cpu_map/x86_kvm32.xml
@@ -1,6 +1,14 @@
+<!-- extra info from qemu:
+  "model.level": "5"
+  "model.stepping": "1"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Common 32-bit KVM processor"
+-->
 <cpus>
   <model name=3D"kvm32">
     <decode host=3D"on" guest=3D"on"/>
+    <signature family=3D"15" model=3D"6"/>
+    <vendor name=3D"Intel"/>
     <feature name=3D"apic"/>
     <feature name=3D"clflush"/>
     <feature name=3D"cmov"/>
@@ -23,5 +31,6 @@
     <feature name=3D"sse"/>
     <feature name=3D"sse2"/>
     <feature name=3D"tsc"/>
+    <feature name=3D"vme"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_kvm64.xml b/src/cpu_map/x86_kvm64.xml
index dafdd7c979..6f59433ec6 100644
--- a/src/cpu_map/x86_kvm64.xml
+++ b/src/cpu_map/x86_kvm64.xml
@@ -1,6 +1,14 @@
+<!-- extra info from qemu:
+  "model.level": "0xd"
+  "model.stepping": "1"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Common KVM processor"
+-->
 <cpus>
   <model name=3D"kvm64">
     <decode host=3D"on" guest=3D"on"/>
+    <signature family=3D"15" model=3D"6"/>
+    <vendor name=3D"Intel"/>
     <feature name=3D"apic"/>
     <feature name=3D"clflush"/>
     <feature name=3D"cmov"/>
@@ -27,5 +35,6 @@
     <feature name=3D"sse2"/>
     <feature name=3D"syscall"/>
     <feature name=3D"tsc"/>
+    <feature name=3D"vme"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_n270.xml b/src/cpu_map/x86_n270.xml
index 0fc392cbe9..870ce88725 100644
--- a/src/cpu_map/x86_n270.xml
+++ b/src/cpu_map/x86_n270.xml
@@ -1,7 +1,15 @@
+<!-- extra info from qemu:
+  "model.level": "10"
+  "model.stepping": "2"
+  "model.xlevel": "0x80000008"
+  "model.model_id": "Intel(R) Atom(TM) CPU N270   @ 1.60GHz"
+-->
 <cpus>
   <model name=3D"n270">
     <decode host=3D"on" guest=3D"on"/>
+    <signature family=3D"6" model=3D"28"/>
     <vendor name=3D"Intel"/>
+    <feature name=3D"acpi"/>
     <feature name=3D"apic"/>
     <feature name=3D"clflush"/>
     <feature name=3D"cmov"/>
@@ -9,10 +17,11 @@
     <feature name=3D"de"/>
     <feature name=3D"fpu"/>
     <feature name=3D"fxsr"/>
+    <feature name=3D"lahf_lm"/>
     <feature name=3D"mca"/>
     <feature name=3D"mce"/>
     <feature name=3D"mmx"/>
-    <feature name=3D"monitor"/>
+    <feature name=3D"movbe"/>
     <feature name=3D"msr"/>
     <feature name=3D"mtrr"/>
     <feature name=3D"nx"/>
@@ -22,6 +31,7 @@
     <feature name=3D"pni"/>
     <feature name=3D"pse"/>
     <feature name=3D"sep"/>
+    <feature name=3D"ss"/>
     <feature name=3D"sse"/>
     <feature name=3D"sse2"/>
     <feature name=3D"ssse3"/>
diff --git a/src/cpu_map/x86_pentium.xml b/src/cpu_map/x86_pentium.xml
index 9863e495eb..4c65b1c00a 100644
--- a/src/cpu_map/x86_pentium.xml
+++ b/src/cpu_map/x86_pentium.xml
@@ -1,6 +1,15 @@
+<!-- extra info from qemu:
+  "model.level": "1"
+  "model.stepping": "3"
+  "model.xlevel": "0"
+  "model.model_id": ""
+-->
 <cpus>
   <model name=3D"pentium">
     <decode host=3D"on" guest=3D"on"/>
+    <signature family=3D"5" model=3D"4"/>
+    <vendor name=3D"Intel"/>
+    <feature name=3D"apic"/>
     <feature name=3D"cx8"/>
     <feature name=3D"de"/>
     <feature name=3D"fpu"/>
diff --git a/src/cpu_map/x86_pentium2.xml b/src/cpu_map/x86_pentium2.xml
index a8fc0fea78..3f59d20b0a 100644
--- a/src/cpu_map/x86_pentium2.xml
+++ b/src/cpu_map/x86_pentium2.xml
@@ -1,6 +1,15 @@
+<!-- extra info from qemu:
+  "model.level": "2"
+  "model.stepping": "2"
+  "model.xlevel": "0"
+  "model.model_id": ""
+-->
 <cpus>
   <model name=3D"pentium2">
     <decode host=3D"on" guest=3D"on"/>
+    <signature family=3D"6" model=3D"5"/>
+    <vendor name=3D"Intel"/>
+    <feature name=3D"apic"/>
     <feature name=3D"cmov"/>
     <feature name=3D"cx8"/>
     <feature name=3D"de"/>
diff --git a/src/cpu_map/x86_pentium3.xml b/src/cpu_map/x86_pentium3.xml
index 7a75b1c517..c25c8c24ad 100644
--- a/src/cpu_map/x86_pentium3.xml
+++ b/src/cpu_map/x86_pentium3.xml
@@ -1,6 +1,15 @@
+<!-- extra info from qemu:
+  "model.level": "3"
+  "model.stepping": "3"
+  "model.xlevel": "0"
+  "model.model_id": ""
+-->
 <cpus>
   <model name=3D"pentium3">
     <decode host=3D"on" guest=3D"on"/>
+    <signature family=3D"6" model=3D"7"/>
+    <vendor name=3D"Intel"/>
+    <feature name=3D"apic"/>
     <feature name=3D"cmov"/>
     <feature name=3D"cx8"/>
     <feature name=3D"de"/>
diff --git a/src/cpu_map/x86_phenom.xml b/src/cpu_map/x86_phenom.xml
index 76bd20b594..f1deb66b38 100644
--- a/src/cpu_map/x86_phenom.xml
+++ b/src/cpu_map/x86_phenom.xml
@@ -1,37 +1,52 @@
+<!-- extra info from qemu:
+  "model.level": "5"
+  "model.stepping": "3"
+  "model.xlevel": "0x8000001A"
+  "model.model_id": "AMD Phenom(tm) 9550 Quad-Core Processor"
+-->
 <cpus>
   <model name=3D"phenom">
     <decode host=3D"on" guest=3D"on"/>
+    <signature family=3D"16" model=3D"2"/>
     <vendor name=3D"AMD"/>
     <feature name=3D"3dnow"/>
     <feature name=3D"3dnowext"/>
+    <feature name=3D"abm"/>
     <feature name=3D"apic"/>
     <feature name=3D"clflush"/>
     <feature name=3D"cmov"/>
+    <feature name=3D"cx16"/>
     <feature name=3D"cx8"/>
     <feature name=3D"de"/>
     <feature name=3D"fpu"/>
     <feature name=3D"fxsr"/>
     <feature name=3D"fxsr_opt"/>
+    <feature name=3D"lahf_lm"/>
     <feature name=3D"lm"/>
     <feature name=3D"mca"/>
     <feature name=3D"mce"/>
     <feature name=3D"mmx"/>
     <feature name=3D"mmxext"/>
-    <feature name=3D"monitor"/>
     <feature name=3D"msr"/>
     <feature name=3D"mtrr"/>
+    <feature name=3D"npt"/>
     <feature name=3D"nx"/>
     <feature name=3D"pae"/>
     <feature name=3D"pat"/>
+    <feature name=3D"pdpe1gb"/>
     <feature name=3D"pge"/>
     <feature name=3D"pni"/>
+    <feature name=3D"popcnt"/>
     <feature name=3D"pse"/>
     <feature name=3D"pse36"/>
+    <feature name=3D"rdtscp"/>
     <feature name=3D"sep"/>
     <feature name=3D"sse"/>
     <feature name=3D"sse2"/>
+    <feature name=3D"sse4a"/>
     <feature name=3D"svm"/>
     <feature name=3D"syscall"/>
     <feature name=3D"tsc"/>
+    <feature name=3D"vme"/>
   </model>
 </cpus>
diff --git a/src/cpu_map/x86_qemu32.xml b/src/cpu_map/x86_qemu32.xml
index 2a126384a6..6c71e5ac17 100644
--- a/src/cpu_map/x86_qemu32.xml
+++ b/src/cpu_map/x86_qemu32.xml
@@ -1,6 +1,14 @@
+<!-- extra info from qemu:
+  "model.level": "4"
+  "model.stepping": "3"
+  "model.xlevel": "0x80000004"
+  "model.model_id": "QEMU Virtual CPU version  QEMU_HW_VERSION"
+-->
 <cpus>
   <model name=3D"qemu32">
     <decode host=3D"on" guest=3D"on"/>
+    <signature family=3D"6" model=3D"6"/>
+    <vendor name=3D"Intel"/>
     <feature name=3D"apic"/>
     <feature name=3D"cmov"/>
     <feature name=3D"cx8"/>
diff --git a/src/cpu_map/x86_qemu64.xml b/src/cpu_map/x86_qemu64.xml
index 61b1ea5a71..d9b7d785e0 100644
--- a/src/cpu_map/x86_qemu64.xml
+++ b/src/cpu_map/x86_qemu64.xml
@@ -1,14 +1,14 @@
+<!-- extra info from qemu:
+  "model.level": "0xd"
+  "model.stepping": "3"
+  "model.xlevel": "0x8000000A"
+  "model.model_id": "QEMU Virtual CPU version  QEMU_HW_VERSION"
+-->
 <cpus>
   <model name=3D"qemu64">
     <decode host=3D"on" guest=3D"on"/>
-    <!-- These are supported only by TCG.  KVM supports them only if the
-         host does.  So we leave them out:
-
-    <feature name=3D"abm"/>
-    <feature name=3D"lahf_lm"/>
-    <feature name=3D"popcnt"/>
-    <feature name=3D"sse4a"/>
-    -->
+    <signature family=3D"6" model=3D"6"/>
+    <vendor name=3D"AMD"/>
     <feature name=3D"apic"/>
     <feature name=3D"clflush"/>
     <feature name=3D"cmov"/>
@@ -17,6 +17,7 @@
     <feature name=3D"de"/>
     <feature name=3D"fpu"/>
     <feature name=3D"fxsr"/>
+    <feature name=3D"lahf_lm"/>
     <feature name=3D"lm"/>
     <feature name=3D"mca"/>
     <feature name=3D"mce"/>
--=20
2.26.2