From nobody Tue May  7 09:04:14 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 205.139.110.61 as permitted sender) client-ip=205.139.110.61;
 envelope-from=libvir-list-bounces@redhat.com;
 helo=us-smtp-delivery-1.mimecast.com;
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 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=1592403557; cv=none;
	d=zohomail.com; s=zohoarc;
	b=aVIGwLawOETJFPjZY61QGw+af+O+yz0hUtp9rHEw4pN4gFN0JLkadRFjwp0c+5TKD/SRgWCYE6gx/W92p5/0EBhwQHIo6gPL0Fpfqgibq2VtvVd07j7+w5Cgm5YTttXa6HCG5xiBZ767I8Y+ku7Bsbw/ngpx8mkhxtZucK8EN8k=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1592403557;
 h=Content-Type:Content-Transfer-Encoding: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=XEi4iIJXJEXaFFYvh50dS0Amz5w94noN2M5jSub4e98=;
	b=fKy6S6/CIbSXJCWpkQrS8zc+yeZbmSOfNxdYIwI71RQ4k58YBdDU+q8kquVSfXxC4IVBCkQqiV2q/wvCbRFTMewE/wjtgXGVcP8HSyQndypTir2AMdCypdbQU2TOOFs2UFWrLs9eQY+dnSc1U2IeN/XNAfD30mGC0xtEdlAZqPQ=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 205.139.110.61 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<jdenemar@redhat.com> (p=none dis=none)
 header.from=<jdenemar@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com
 [205.139.110.61]) by mx.zohomail.com
	with SMTPS id 1592403557093355.16849333256266;
 Wed, 17 Jun 2020 07:19:17 -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-464-uaQZkzy3PxWFzglkxLwyXA-1; Wed, 17 Jun 2020 10:19:12 -0400
Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com
 [10.5.11.22])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 40A531100F67;
	Wed, 17 Jun 2020 14:19:07 +0000 (UTC)
Received: from colo-mx.corp.redhat.com
 (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 1C7DA1001B2B;
	Wed, 17 Jun 2020 14:19:07 +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 AE9631809554;
	Wed, 17 Jun 2020 14:19:05 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
	[10.5.11.11])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 05HEJ2Lm004984 for <libvir-list@listman.util.phx.redhat.com>;
	Wed, 17 Jun 2020 10:19:02 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id DD8C779303; Wed, 17 Jun 2020 14:19:02 +0000 (UTC)
Received: from virval.usersys.redhat.com (unknown [10.40.192.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 5D1BA512FE
	for <libvir-list@redhat.com>; Wed, 17 Jun 2020 14:18:59 +0000 (UTC)
Received: by virval.usersys.redhat.com (Postfix, from userid 500)
	id EF066243697; Wed, 17 Jun 2020 16:18:57 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1592403555;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to: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=XEi4iIJXJEXaFFYvh50dS0Amz5w94noN2M5jSub4e98=;
	b=VcUo0ivJCJ9GYteLbx2AlnQf+xAFbarFdbw/FV67c7sr4QAsjEwIirB674AT6Nuw31c1nr
	W2uOlpJkk70s/jrF564QibO6BYNMlyHSW0flq0Jgud3m7iKGwf6jR2q10gFwtNoYlVsyE2
	8lV6k7Lc+oMvTN7yn6xX+wHvj7Wui/A=
X-MC-Unique: uaQZkzy3PxWFzglkxLwyXA-1
From: Jiri Denemark <jdenemar@redhat.com>
To: libvir-list@redhat.com
Subject: [libvirt PATCH 1/4] cpu_map: Request test files update when adding
	x86 features
Date: Wed, 17 Jun 2020 16:18:51 +0200
Message-Id: 
 <6abeffb7ef39c2fff9d6b149df6c392ba2fada12.1592401703.git.jdenemar@redhat.com>
In-Reply-To: <cover.1592401703.git.jdenemar@redhat.com>
References: <cover.1592401703.git.jdenemar@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-loop: libvir-list@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.22
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"

The CPUID data in *-{disabled,enabled}.xml convert feature names from
the corresponding *.json file into raw CPUID and MSR data and thus some
of them may need to be updated when new features are added into the CPU
map.

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/cpu_map/x86_features.xml                               | 7 +++++++
 tests/cputestdata/x86_64-cpuid-Core-i5-6600-disabled.xml   | 1 +
 .../x86_64-cpuid-Core-i7-5600U-arat-disabled.xml           | 1 +
 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-disabled.xml  | 1 +
 .../x86_64-cpuid-Core-i7-5600U-ibrs-disabled.xml           | 2 +-
 tests/cputestdata/x86_64-cpuid-Core-i7-7700-disabled.xml   | 1 +
 .../x86_64-cpuid-EPYC-7601-32-Core-disabled.xml            | 1 +
 .../x86_64-cpuid-EPYC-7601-32-Core-ibpb-disabled.xml       | 1 +
 .../x86_64-cpuid-Hygon-C86-7185-32-core-disabled.xml       | 1 +
 .../x86_64-cpuid-Ryzen-7-1800X-Eight-Core-disabled.xml     | 1 +
 .../cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-disabled.xml  | 1 +
 .../cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-disabled.xml  | 2 +-
 .../cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-disabled.xml  | 2 +-
 tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-disabled.xml | 2 +-
 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-disabled.xml | 2 +-
 .../x86_64-cpuid-Xeon-Platinum-8268-disabled.xml           | 3 ++-
 16 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index 8525ae0fa5..e91a7b5055 100644
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -1,3 +1,10 @@
+<!--
+  After adding new features, update existing test files with
+
+    for json in tests/cputestdata/x86_64-cpuid-*.json; do
+      tests/cputestdata/cpu-cpuid.py diff $json
+    done
+-->
 <cpus>
   <!-- standard features, EDX -->
   <feature name=3D'fpu'>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-disabled.xml b/tes=
ts/cputestdata/x86_64-cpuid-Core-i5-6600-disabled.xml
index 510cd97a5b..040c0df183 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-disabled.xml
@@ -1,5 +1,6 @@
 <!-- Features disabled by QEMU -->
 <cpudata arch=3D'x86'>
   <cpuid eax_in=3D'0x00000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x0800c1fc' edx=3D'0xb0600000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02000000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-disabled.xml=
 b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-disabled.xml
index 601554a815..edce01618a 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-disabled.xml
@@ -2,5 +2,6 @@
 <cpudata arch=3D'x86'>
   <cpuid eax_in=3D'0x00000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x0800c1dc' edx=3D'0xb0600000'/>
   <cpuid eax_in=3D'0x00000006' ecx_in=3D'0x00' eax=3D'0x00000004' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02000000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-disabled.xml b/te=
sts/cputestdata/x86_64-cpuid-Core-i7-5600U-disabled.xml
index 4a0477f788..fa9571c29d 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-disabled.xml
@@ -1,5 +1,6 @@
 <!-- Features disabled by QEMU -->
 <cpudata arch=3D'x86'>
   <cpuid eax_in=3D'0x00000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x0800c1dc' edx=3D'0xb0600000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02000000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-disabled.xml=
 b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-disabled.xml
index 5c9cfa9bd6..91ae45d24b 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-disabled.xml
@@ -1,6 +1,6 @@
 <!-- Features disabled by QEMU -->
 <cpudata arch=3D'x86'>
   <cpuid eax_in=3D'0x00000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x0800c1dc' edx=3D'0xb0600000'/>
-  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x0c000000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02000000' ecx=3D'0x00000000' edx=3D'0x0c000000'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-disabled.xml b/tes=
ts/cputestdata/x86_64-cpuid-Core-i7-7700-disabled.xml
index fcdcc97e0e..ce51903e53 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-disabled.xml
@@ -1,6 +1,7 @@
 <!-- Features disabled by QEMU -->
 <cpudata arch=3D'x86'>
   <cpuid eax_in=3D'0x00000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x0800c1fc' edx=3D'0xb0600000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02000000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x0000000d' ecx_in=3D'0x01' eax=3D'0x00000008' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-disabled.xml =
b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-disabled.xml
index 747d725acf..d9045c88d5 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-disabled.xml
@@ -4,4 +4,5 @@
   <cpuid eax_in=3D'0x0000000d' ecx_in=3D'0x01' eax=3D'0x00000008' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x01c2300c' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
+  <cpuid eax_in=3D'0x80000008' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000001' ecx=3D'0x00000000' edx=3D'0x00000000'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-disabled=
.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-disabled.xml
index af43fca98d..429d84d031 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-disabled.xml
@@ -4,4 +4,5 @@
   <cpuid eax_in=3D'0x0000000d' ecx_in=3D'0x01' eax=3D'0x00000008' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x01c2300c' edx=3D'0x08000000'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
+  <cpuid eax_in=3D'0x80000008' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000001' ecx=3D'0x00000000' edx=3D'0x00000000'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-disabled=
.xml b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-disabled.xml
index 747d725acf..d9045c88d5 100644
--- a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-disabled.xml
@@ -4,4 +4,5 @@
   <cpuid eax_in=3D'0x0000000d' ecx_in=3D'0x01' eax=3D'0x00000008' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x01c2300c' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
+  <cpuid eax_in=3D'0x80000008' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000001' ecx=3D'0x00000000' edx=3D'0x00000000'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-disabl=
ed.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-disabled.x=
ml
index b085050618..7dbacf982d 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-disabled.xml
@@ -5,4 +5,5 @@
   <cpuid eax_in=3D'0x0000000d' ecx_in=3D'0x01' eax=3D'0x00000008' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x01c23008' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
+  <cpuid eax_in=3D'0x80000008' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000001' ecx=3D'0x00000000' edx=3D'0x00000000'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-disabled.xml b/=
tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-disabled.xml
index 4a0477f788..fa9571c29d 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-disabled.xml
@@ -1,5 +1,6 @@
 <!-- Features disabled by QEMU -->
 <cpudata arch=3D'x86'>
   <cpuid eax_in=3D'0x00000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x0800c1dc' edx=3D'0xb0600000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02000000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-disabled.xml b/=
tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-disabled.xml
index 85369d755c..40ee740aa8 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-disabled.xml
@@ -1,7 +1,7 @@
 <!-- Features disabled by QEMU -->
 <cpudata arch=3D'x86'>
   <cpuid eax_in=3D'0x00000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x0804c1fc' edx=3D'0xb0600000'/>
-  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00001000' ecx=3D'0x00000000' edx=3D'0x08000000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02001000' ecx=3D'0x00000000' edx=3D'0x08000000'/>
   <cpuid eax_in=3D'0x0000000f' ecx_in=3D'0x01' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000006'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-disabled.xml b/=
tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-disabled.xml
index d904808cec..3ffb246167 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-disabled.xml
@@ -1,7 +1,7 @@
 <!-- Features disabled by QEMU -->
 <cpudata arch=3D'x86'>
   <cpuid eax_in=3D'0x00000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x0804c1fc' edx=3D'0xb0600000'/>
-  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00001000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02001000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x0000000f' ecx_in=3D'0x01' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000006'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-disabled.xml b/t=
ests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-disabled.xml
index a5b85a15c2..c65c3caecf 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-disabled.xml
@@ -1,7 +1,7 @@
 <!-- Features disabled by QEMU -->
 <cpudata arch=3D'x86'>
   <cpuid eax_in=3D'0x00000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x0804c1fc' edx=3D'0xb0600000'/>
-  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00001000' ecx=3D'0x00000008' edx=3D'0x08000000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02001000' ecx=3D'0x00000008' edx=3D'0x08000000'/>
   <cpuid eax_in=3D'0x0000000d' ecx_in=3D'0x01' eax=3D'0x00000008' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x0000000f' ecx_in=3D'0x01' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000006'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-disabled.xml b/t=
ests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-disabled.xml
index b5c70a9dc4..9b84b8fb47 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-disabled.xml
@@ -1,7 +1,7 @@
 <!-- Features disabled by QEMU -->
 <cpudata arch=3D'x86'>
   <cpuid eax_in=3D'0x00000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x0804c1fc' edx=3D'0xb0600000'/>
-  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00001000' ecx=3D'0x00000008' edx=3D'0x00000000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02001000' ecx=3D'0x00000008' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x0000000d' ecx_in=3D'0x01' eax=3D'0x00000008' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x0000000f' ecx_in=3D'0x01' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000006'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-disabled.xml=
 b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-disabled.xml
index 32522eb9af..7d719a8b52 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-disabled.xml
@@ -1,7 +1,8 @@
 <!-- Features disabled by QEMU -->
 <cpudata arch=3D'x86'>
   <cpuid eax_in=3D'0x00000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x0804c1fc' edx=3D'0xb0600000'/>
-  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02001000' ecx=3D'0x00000010' edx=3D'0x28000000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02001000' ecx=3D'0x00000010' edx=3D'0x28000400'/>
   <cpuid eax_in=3D'0x0000000f' ecx_in=3D'0x01' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000006'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
+  <msr index=3D'0x10a' edx=3D'0x00000000' eax=3D'0x00000020'/>
 </cpudata>
--=20
2.27.0

From nobody Tue May  7 09:04:14 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 207.211.31.120 as permitted sender) client-ip=207.211.31.120;
 envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com;
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1592403556; cv=none;
	d=zohomail.com; s=zohoarc;
	b=To3Dqpz05fbwsaJ+DaKcd4lK5y5FZl2n0bwEZOCq1hk3kBS1nu5og//PMfGu5Jzd3N8dlyI1/Nh4u0RAyNM4jbtQkE8z2QIAICIaRsGoYR1pq/BxY3WDzL1jeTzNjk2DXgnQ2UCop7jVcVg8RjptRW1w+xvRBdd9tu9MKETq9+g=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1592403556;
 h=Content-Type:Content-Transfer-Encoding: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=LRkOwSwmdrJovagSRBB52pHrYkU6D3edenVcagNmRnk=;
	b=cCaU61EMqPKjtp7EsKN/p8KsrAhJmKVAk4tCaAqByYoJOnS1inZTpYkyT9oUVPNwxXZv59Dr5O1F0nmQSHZu+rX5yIHpaFAV8hcaI+Z8bMz/3U7G7p5TYsJOJPXYDK5elwYHgOjbi9CZhQiUmog394e0A6+/WJ9T+aHfSkzSjs0=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<jdenemar@redhat.com> (p=none dis=none)
 header.from=<jdenemar@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com
 [207.211.31.120]) by mx.zohomail.com
	with SMTPS id 1592403556254469.9057662669653;
 Wed, 17 Jun 2020 07:19:16 -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-43-JDEchDdRNqOLdvMZIEHFsQ-1; Wed, 17 Jun 2020 10:19:12 -0400
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
 [10.5.11.11])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2C4E410059BA;
	Wed, 17 Jun 2020 14:19:07 +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 0E52C512FE;
	Wed, 17 Jun 2020 14:19:07 +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 96943833CA;
	Wed, 17 Jun 2020 14:19:05 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com
	[10.5.11.11])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 05HEJ2R6004974 for <libvir-list@listman.util.phx.redhat.com>;
	Wed, 17 Jun 2020 10:19:02 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id B44C579307; Wed, 17 Jun 2020 14:19:02 +0000 (UTC)
Received: from virval.usersys.redhat.com (unknown [10.40.192.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 5D22279303
	for <libvir-list@redhat.com>; Wed, 17 Jun 2020 14:18:59 +0000 (UTC)
Received: by virval.usersys.redhat.com (Postfix, from userid 500)
	id F120E2436BE; Wed, 17 Jun 2020 16:18:57 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1592403554;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to: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=LRkOwSwmdrJovagSRBB52pHrYkU6D3edenVcagNmRnk=;
	b=UkOpYECxs3T1lRVOXTVwsp4cb81P0FZDsCqEYYHqWZjdDhlEX1Sk9p9oOnsROnYwq591+n
	GVXYW4Kr1SL8AImpAogiqTTFx8NygSZAUjPTCsjzSThr+g7W5hmH6xSKWART9rV3TfKAz0
	iTQo5Z/N9jLqWG42rxvcN7MUjGB6Nj0=
X-MC-Unique: JDEchDdRNqOLdvMZIEHFsQ-1
From: Jiri Denemark <jdenemar@redhat.com>
To: libvir-list@redhat.com
Subject: [libvirt PATCH 2/4] cpu_map: Add missing x86 features in 0x7 CPUID
	leaf
Date: Wed, 17 Jun 2020 16:18:52 +0200
Message-Id: 
 <2af86bb80a9487be1834de67f7b54198156efe36.1592401703.git.jdenemar@redhat.com>
In-Reply-To: <cover.1592401703.git.jdenemar@redhat.com>
References: <cover.1592401703.git.jdenemar@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-loop: libvir-list@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.79 on 10.5.11.11
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"

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/cpu_map/x86_features.xml                         | 12 ++++++++++++
 .../x86_64-cpuid-Ice-Lake-Server-disabled.xml        |  2 +-
 .../x86_64-cpuid-Ice-Lake-Server-guest.xml           |  1 +
 .../x86_64-cpuid-Ice-Lake-Server-host.xml            |  1 +
 .../x86_64-cpuid-Ryzen-9-3900X-12-Core-enabled.xml   |  2 +-
 .../x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml     |  1 +
 .../x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml      |  1 +
 .../x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml      |  1 +
 tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml       |  1 +
 tests/domaincapsdata/qemu_5.1.0.x86_64.xml           |  1 +
 10 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index e91a7b5055..81d1ad5c69 100644
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -293,6 +293,9 @@
   <feature name=3D'ospke'>
     <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x00000010'/>
   </feature>
+  <feature name=3D'waitpkg'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x00000020'/>
+  </feature>
   <feature name=3D'avx512vbmi2'>
     <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x00000040'/>
   </feature>
@@ -317,9 +320,18 @@
   <feature name=3D'la57'>
     <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x00010000'/>
   </feature>
+  <feature name=3D'rdpid'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x00400000'/>
+  </feature>
   <feature name=3D'cldemote'>
     <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x02000000'/>
   </feature>
+  <feature name=3D'movdiri'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x08000000'/>
+  </feature>
+  <feature name=3D'movdir64b'>
+    <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' ecx=3D'0x10000000'/>
+  </feature>
=20
   <feature name=3D'avx512-4vnniw'>
     <cpuid eax_in=3D'0x07' ecx_in=3D'0x00' edx=3D'0x00000004'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml b/=
tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml
index 62c6bad612..ce65579bcc 100644
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml
@@ -1,7 +1,7 @@
 <!-- Features disabled by QEMU -->
 <cpudata arch=3D'x86'>
   <cpuid eax_in=3D'0x00000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x0804c1fc' edx=3D'0xb0600000'/>
-  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02001000' ecx=3D'0x00000010' edx=3D'0x00000000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02001000' ecx=3D'0x00400010' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x0000000f' ecx_in=3D'0x01' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000006'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
 </cpudata>
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 4676f3aa7d..9b75ace710 100644
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
@@ -23,6 +23,7 @@
   <feature policy=3D'require' name=3D'avx512ifma'/>
   <feature policy=3D'require' name=3D'sha-ni'/>
   <feature policy=3D'require' name=3D'ospke'/>
+  <feature policy=3D'require' name=3D'rdpid'/>
   <feature policy=3D'require' name=3D'stibp'/>
   <feature policy=3D'require' name=3D'arch-capabilities'/>
   <feature policy=3D'require' name=3D'xsaves'/>
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 35b9e39629..efbf9d363b 100644
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml
@@ -24,6 +24,7 @@
   <feature name=3D'avx512ifma'/>
   <feature name=3D'sha-ni'/>
   <feature name=3D'ospke'/>
+  <feature name=3D'rdpid'/>
   <feature name=3D'stibp'/>
   <feature name=3D'arch-capabilities'/>
   <feature name=3D'xsaves'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-enabled.x=
ml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-enabled.xml
index 641032e1b6..80bcccd009 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-enabled.xml
@@ -2,7 +2,7 @@
 <cpudata arch=3D'x86'>
   <cpuid eax_in=3D'0x00000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0xf7f83203' edx=3D'0x078bfbff'/>
   <cpuid eax_in=3D'0x00000006' ecx_in=3D'0x00' eax=3D'0x00000004' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
-  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x219c01ab' ecx=3D'0x00000004' edx=3D'0xa8000000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x219c01ab' ecx=3D'0x00400004' edx=3D'0xa8000000'/>
   <cpuid eax_in=3D'0x0000000d' ecx_in=3D'0x01' eax=3D'0x0000000f' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x008003f7' edx=3D'0x2e500800'/>
   <cpuid eax_in=3D'0x80000008' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x03001201' ecx=3D'0x00000000' edx=3D'0x00000000'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml=
 b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml
index 86e96e07ef..ec12363e71 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml
@@ -6,6 +6,7 @@
   <feature policy=3D'require' name=3D'cmt'/>
   <feature policy=3D'require' name=3D'clwb'/>
   <feature policy=3D'require' name=3D'umip'/>
+  <feature policy=3D'require' name=3D'rdpid'/>
   <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-Ryzen-9-3900X-12-Core-host.xml =
b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml
index c63fb00cfa..dee05585aa 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml
@@ -7,6 +7,7 @@
   <feature name=3D'cmt'/>
   <feature name=3D'clwb'/>
   <feature name=3D'umip'/>
+  <feature name=3D'rdpid'/>
   <feature name=3D'xsaves'/>
   <feature name=3D'mbm_total'/>
   <feature name=3D'mbm_local'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml =
b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml
index 154c2af77d..735ec8ea2d 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml
@@ -7,6 +7,7 @@
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'clwb'/>
   <feature policy=3D'require' name=3D'umip'/>
+  <feature policy=3D'require' name=3D'rdpid'/>
   <feature policy=3D'require' name=3D'stibp'/>
   <feature policy=3D'require' name=3D'arch-capabilities'/>
   <feature policy=3D'require' name=3D'ssbd'/>
diff --git a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml b/tests/domainc=
apsdata/qemu_5.1.0-q35.x86_64.xml
index d0917652e1..6b061b82de 100644
--- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
@@ -44,6 +44,7 @@
       <feature policy=3D'require' name=3D'tsc_adjust'/>
       <feature policy=3D'require' name=3D'clwb'/>
       <feature policy=3D'require' name=3D'umip'/>
+      <feature policy=3D'require' name=3D'rdpid'/>
       <feature policy=3D'require' name=3D'stibp'/>
       <feature policy=3D'require' name=3D'arch-capabilities'/>
       <feature policy=3D'require' name=3D'ssbd'/>
diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml b/tests/domaincapsd=
ata/qemu_5.1.0.x86_64.xml
index f33066759d..def35db95f 100644
--- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
@@ -43,6 +43,7 @@
       <feature policy=3D'require' name=3D'tsc_adjust'/>
       <feature policy=3D'require' name=3D'clwb'/>
       <feature policy=3D'require' name=3D'umip'/>
+      <feature policy=3D'require' name=3D'rdpid'/>
       <feature policy=3D'require' name=3D'stibp'/>
       <feature policy=3D'require' name=3D'arch-capabilities'/>
       <feature policy=3D'require' name=3D'ssbd'/>
--=20
2.27.0

From nobody Tue May  7 09:04:14 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 207.211.31.81 as permitted sender) client-ip=207.211.31.81;
 envelope-from=libvir-list-bounces@redhat.com;
 helo=us-smtp-delivery-1.mimecast.com;
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1592403614; cv=none;
	d=zohomail.com; s=zohoarc;
	b=GAcpfqBgIgj15e0rEqklLj13s3lCi9lnpBk1pbNb2xjCkot6BV3G9jFhGJqJCtidqUYAhCDBnUx1TAMrmtV9U9hZ3IMjUvkFh5zVrrDklTJNNFf3VPhURa9SXYBu+REn0i6WvALcVfg0rlRugCleN0ZVxuoPpbTYCZ6qnIiDCD8=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1592403614;
 h=Content-Type:Content-Transfer-Encoding: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=Mh2bjD0UWW4TuwvBkfA0wBmtjcWExdsgTIT8P8XueyQ=;
	b=S2KresNYZ5AxD0hGocAp18AsUpbBxPiHk4Zqn4B1qOy8EEOtYtaOyTM+lCJP6vtk57R2+7bV+YtFxhCDdOfytSvWBvCM7ErCe67A/2oBsCHFQYvuQ7ZiOeEBUDBjZmR48wpl2IU2qt+EafdK8HvCloAWHYhm32rnwRFvxp8ozUM=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<jdenemar@redhat.com> (p=none dis=none)
 header.from=<jdenemar@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com
 [207.211.31.81]) by mx.zohomail.com
	with SMTPS id 159240361471984.83344747114427;
 Wed, 17 Jun 2020 07:20:14 -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-241-lmXJlGabPNaAmM3MRt33fw-1; Wed, 17 Jun 2020 10:19:15 -0400
Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com
 [10.5.11.13])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2580A1100F6B;
	Wed, 17 Jun 2020 14:19:10 +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 057A51C8;
	Wed, 17 Jun 2020 14:19:10 +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 CD9D9833CF;
	Wed, 17 Jun 2020 14:19:09 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com
	[10.5.11.23])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 05HEJ2cP004966 for <libvir-list@listman.util.phx.redhat.com>;
	Wed, 17 Jun 2020 10:19:02 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id 781C019932; Wed, 17 Jun 2020 14:19:02 +0000 (UTC)
Received: from virval.usersys.redhat.com (unknown [10.40.192.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id EA7D619D9E
	for <libvir-list@redhat.com>; Wed, 17 Jun 2020 14:18:59 +0000 (UTC)
Received: by virval.usersys.redhat.com (Postfix, from userid 500)
	id F361A2436BF; Wed, 17 Jun 2020 16:18:57 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1592403613;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to: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=Mh2bjD0UWW4TuwvBkfA0wBmtjcWExdsgTIT8P8XueyQ=;
	b=TEpOTcbaR/fsfosVG03lKqz3ZLfy56WnwsPjVcwacwz351I/fqNQdMvovTXQSFd1VMhC9P
	qPW5rBAKymo9C2pZ1f0ho1pW/NL5rakNVTPIs8a6YsBebC+06qEqBGfOz6ACVpV5F+/Ic7
	t/y0tigKX+8sMkw1V5arTgu8GppSgrw=
X-MC-Unique: lmXJlGabPNaAmM3MRt33fw-1
From: Jiri Denemark <jdenemar@redhat.com>
To: libvir-list@redhat.com
Subject: [libvirt PATCH 3/4] cpu_map: Add missing x86 features in 0x80000008
	CPUID leaf
Date: Wed, 17 Jun 2020 16:18:53 +0200
Message-Id: 
 <783eeebd40a37a306c89cca9d63fd73957f4d404.1592401703.git.jdenemar@redhat.com>
In-Reply-To: <cover.1592401703.git.jdenemar@redhat.com>
References: <cover.1592401703.git.jdenemar@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23
X-loop: libvir-list@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.79 on 10.5.11.13
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"

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/cpu_map/x86_features.xml                                | 6 ++++++
 tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml       | 2 +-
 tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml          | 1 +
 .../cputestdata/x86_64-cpuid-EPYC-7601-32-Core-disabled.xml | 2 +-
 tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml  | 1 +
 tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml   | 1 +
 .../x86_64-cpuid-EPYC-7601-32-Core-ibpb-disabled.xml        | 2 +-
 .../x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml           | 1 +
 .../x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml            | 1 +
 .../x86_64-cpuid-Hygon-C86-7185-32-core-disabled.xml        | 2 +-
 .../x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml           | 1 +
 .../x86_64-cpuid-Hygon-C86-7185-32-core-host.xml            | 1 +
 .../x86_64-cpuid-Ryzen-7-1800X-Eight-Core-disabled.xml      | 2 +-
 .../x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml         | 1 +
 .../x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml          | 1 +
 .../x86_64-cpuid-Ryzen-9-3900X-12-Core-disabled.xml         | 1 +
 .../x86_64-cpuid-Ryzen-9-3900X-12-Core-enabled.xml          | 2 +-
 .../x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml            | 2 ++
 .../cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml | 2 ++
 .../cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml | 1 +
 tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml              | 2 ++
 tests/domaincapsdata/qemu_5.1.0.x86_64.xml                  | 2 ++
 22 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index 81d1ad5c69..cb250555f6 100644
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -493,12 +493,18 @@
   <feature name=3D'clzero'>
     <cpuid eax_in=3D'0x80000008' ebx=3D'0x00000001'/>
   </feature>
+  <feature name=3D'xsaveerptr'>
+    <cpuid eax_in=3D'0x80000008' ebx=3D'0x00000004'/>
+  </feature>
   <feature name=3D'wbnoinvd'>
     <cpuid eax_in=3D'0x80000008' ebx=3D'0x00000200'/>
   </feature>
   <feature name=3D'ibpb'>
     <cpuid eax_in=3D'0x80000008' ebx=3D'0x00001000'/>
   </feature>
+  <feature name=3D'amd-stibp'>
+    <cpuid eax_in=3D'0x80000008' ebx=3D'0x00008000'/>
+  </feature>
   <feature name=3D'amd-ssbd'>
     <cpuid eax_in=3D'0x80000008' ebx=3D'0x01000000'/>
   </feature>
diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml b/tests/=
cputestdata/x86_64-cpuid-Cooperlake-enabled.xml
index 2d7f83c80f..1d91c3efa8 100644
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-enabled.xml
@@ -6,6 +6,6 @@
   <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x01' eax=3D'0x00000020' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x0000000d' ecx_in=3D'0x01' eax=3D'0x0000000f' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000121' edx=3D'0x2c100800'/>
-  <cpuid eax_in=3D'0x80000008' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x01001000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
+  <cpuid eax_in=3D'0x80000008' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x01009000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <msr index=3D'0x10a' edx=3D'0x00000000' eax=3D'0x000001eb'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml b/tests/cpu=
testdata/x86_64-cpuid-Cooperlake-json.xml
index fb319d547c..c89e0e5350 100644
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-json.xml
@@ -10,6 +10,7 @@
   <feature policy=3D'require' name=3D'md-clear'/>
   <feature policy=3D'require' name=3D'xsaves'/>
   <feature policy=3D'require' name=3D'ibpb'/>
+  <feature policy=3D'require' name=3D'amd-stibp'/>
   <feature policy=3D'require' name=3D'amd-ssbd'/>
   <feature policy=3D'require' name=3D'tsx-ctrl'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-disabled.xml =
b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-disabled.xml
index d9045c88d5..c26c9c7be3 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-disabled.xml
@@ -4,5 +4,5 @@
   <cpuid eax_in=3D'0x0000000d' ecx_in=3D'0x01' eax=3D'0x00000008' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x01c2300c' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
-  <cpuid eax_in=3D'0x80000008' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000001' ecx=3D'0x00000000' edx=3D'0x00000000'/>
+  <cpuid eax_in=3D'0x80000008' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000005' ecx=3D'0x00000000' edx=3D'0x00000000'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml b/t=
ests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml
index b75196aac5..612e571609 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml
@@ -14,4 +14,5 @@
   <feature policy=3D'require' name=3D'perfctr_nb'/>
   <feature policy=3D'require' name=3D'invtsc'/>
   <feature policy=3D'require' name=3D'clzero'/>
+  <feature policy=3D'require' name=3D'xsaveerptr'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml b/te=
sts/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml
index fd84b526db..7498d924e2 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml
@@ -15,4 +15,5 @@
   <feature name=3D'perfctr_nb'/>
   <feature name=3D'invtsc'/>
   <feature name=3D'clzero'/>
+  <feature name=3D'xsaveerptr'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-disabled=
.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-disabled.xml
index 429d84d031..a7f4fa3f01 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-disabled.xml
@@ -4,5 +4,5 @@
   <cpuid eax_in=3D'0x0000000d' ecx_in=3D'0x01' eax=3D'0x00000008' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x01c2300c' edx=3D'0x08000000'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
-  <cpuid eax_in=3D'0x80000008' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000001' ecx=3D'0x00000000' edx=3D'0x00000000'/>
+  <cpuid eax_in=3D'0x80000008' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000005' ecx=3D'0x00000000' edx=3D'0x00000000'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xm=
l b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml
index 5044c8cc35..96fdea306f 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml
@@ -14,5 +14,6 @@
   <feature policy=3D'require' name=3D'perfctr_nb'/>
   <feature policy=3D'require' name=3D'invtsc'/>
   <feature policy=3D'require' name=3D'clzero'/>
+  <feature policy=3D'require' name=3D'xsaveerptr'/>
   <feature policy=3D'disable' name=3D'rdtscp'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml=
 b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml
index d7d5ce88d9..4fff74f3aa 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml
@@ -15,4 +15,5 @@
   <feature name=3D'perfctr_nb'/>
   <feature name=3D'invtsc'/>
   <feature name=3D'clzero'/>
+  <feature name=3D'xsaveerptr'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-disabled=
.xml b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-disabled.xml
index d9045c88d5..c26c9c7be3 100644
--- a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-disabled.xml
@@ -4,5 +4,5 @@
   <cpuid eax_in=3D'0x0000000d' ecx_in=3D'0x01' eax=3D'0x00000008' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x01c2300c' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
-  <cpuid eax_in=3D'0x80000008' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000001' ecx=3D'0x00000000' edx=3D'0x00000000'/>
+  <cpuid eax_in=3D'0x80000008' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000005' ecx=3D'0x00000000' edx=3D'0x00000000'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xm=
l b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml
index 75c71233c6..844b8b9d4f 100644
--- a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml
@@ -14,4 +14,5 @@
   <feature policy=3D'require' name=3D'perfctr_nb'/>
   <feature policy=3D'require' name=3D'invtsc'/>
   <feature policy=3D'require' name=3D'clzero'/>
+  <feature policy=3D'require' name=3D'xsaveerptr'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml=
 b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml
index 82f28067c4..3d1b143eba 100644
--- a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml
@@ -15,4 +15,5 @@
   <feature name=3D'perfctr_nb'/>
   <feature name=3D'invtsc'/>
   <feature name=3D'clzero'/>
+  <feature name=3D'xsaveerptr'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-disabl=
ed.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-disabled.x=
ml
index 7dbacf982d..0358ecf478 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-disabled.xml
@@ -5,5 +5,5 @@
   <cpuid eax_in=3D'0x0000000d' ecx_in=3D'0x01' eax=3D'0x00000008' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x01c23008' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
-  <cpuid eax_in=3D'0x80000008' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000001' ecx=3D'0x00000000' edx=3D'0x00000000'/>
+  <cpuid eax_in=3D'0x80000008' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000005' ecx=3D'0x00000000' edx=3D'0x00000000'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.=
xml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml
index b75196aac5..612e571609 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml
@@ -14,4 +14,5 @@
   <feature policy=3D'require' name=3D'perfctr_nb'/>
   <feature policy=3D'require' name=3D'invtsc'/>
   <feature policy=3D'require' name=3D'clzero'/>
+  <feature policy=3D'require' name=3D'xsaveerptr'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.x=
ml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml
index fd84b526db..7498d924e2 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml
@@ -15,4 +15,5 @@
   <feature name=3D'perfctr_nb'/>
   <feature name=3D'invtsc'/>
   <feature name=3D'clzero'/>
+  <feature name=3D'xsaveerptr'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-disabled.=
xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-disabled.xml
index 7feb55f0b7..c7107c2488 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-disabled.xml
@@ -5,4 +5,5 @@
   <cpuid eax_in=3D'0x0000000f' ecx_in=3D'0x01' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000006'/>
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x01423408' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
+  <cpuid eax_in=3D'0x80000008' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00008000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-enabled.x=
ml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-enabled.xml
index 80bcccd009..ce0665bf59 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-enabled.xml
@@ -5,6 +5,6 @@
   <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x219c01ab' ecx=3D'0x00400004' edx=3D'0xa8000000'/>
   <cpuid eax_in=3D'0x0000000d' ecx_in=3D'0x01' eax=3D'0x0000000f' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x008003f7' edx=3D'0x2e500800'/>
-  <cpuid eax_in=3D'0x80000008' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x03001201' ecx=3D'0x00000000' edx=3D'0x00000000'/>
+  <cpuid eax_in=3D'0x80000008' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x03001205' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <msr index=3D'0x10a' edx=3D'0x00000000' eax=3D'0x00000069'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml=
 b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml
index ec12363e71..7978231383 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml
@@ -21,7 +21,9 @@
   <feature policy=3D'require' name=3D'perfctr_nb'/>
   <feature policy=3D'require' name=3D'invtsc'/>
   <feature policy=3D'require' name=3D'clzero'/>
+  <feature policy=3D'require' name=3D'xsaveerptr'/>
   <feature policy=3D'require' name=3D'wbnoinvd'/>
+  <feature policy=3D'require' name=3D'amd-stibp'/>
   <feature policy=3D'require' name=3D'amd-ssbd'/>
   <feature policy=3D'require' name=3D'rdctl-no'/>
   <feature policy=3D'require' name=3D'skip-l1dfl-vmentry'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml =
b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml
index dee05585aa..478d5b7ab5 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml
@@ -22,7 +22,9 @@
   <feature name=3D'perfctr_nb'/>
   <feature name=3D'invtsc'/>
   <feature name=3D'clzero'/>
+  <feature name=3D'xsaveerptr'/>
   <feature name=3D'wbnoinvd'/>
+  <feature name=3D'amd-stibp'/>
   <feature name=3D'amd-ssbd'/>
   <feature name=3D'rdctl-no'/>
   <feature name=3D'skip-l1dfl-vmentry'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml =
b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml
index 735ec8ea2d..a64e9fe1e5 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml
@@ -15,6 +15,7 @@
   <feature policy=3D'require' name=3D'cmp_legacy'/>
   <feature policy=3D'require' name=3D'perfctr_core'/>
   <feature policy=3D'require' name=3D'clzero'/>
+  <feature policy=3D'require' name=3D'xsaveerptr'/>
   <feature policy=3D'require' name=3D'wbnoinvd'/>
   <feature policy=3D'require' name=3D'amd-ssbd'/>
   <feature policy=3D'require' name=3D'virt-ssbd'/>
diff --git a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml b/tests/domainc=
apsdata/qemu_5.1.0-q35.x86_64.xml
index 6b061b82de..43a2142a9f 100644
--- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
@@ -53,7 +53,9 @@
       <feature policy=3D'require' name=3D'perfctr_core'/>
       <feature policy=3D'require' name=3D'invtsc'/>
       <feature policy=3D'require' name=3D'clzero'/>
+      <feature policy=3D'require' name=3D'xsaveerptr'/>
       <feature policy=3D'require' name=3D'wbnoinvd'/>
+      <feature policy=3D'require' name=3D'amd-stibp'/>
       <feature policy=3D'require' name=3D'amd-ssbd'/>
       <feature policy=3D'require' name=3D'virt-ssbd'/>
       <feature policy=3D'require' name=3D'rdctl-no'/>
diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml b/tests/domaincapsd=
ata/qemu_5.1.0.x86_64.xml
index def35db95f..aeede0bac6 100644
--- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
@@ -52,7 +52,9 @@
       <feature policy=3D'require' name=3D'perfctr_core'/>
       <feature policy=3D'require' name=3D'invtsc'/>
       <feature policy=3D'require' name=3D'clzero'/>
+      <feature policy=3D'require' name=3D'xsaveerptr'/>
       <feature policy=3D'require' name=3D'wbnoinvd'/>
+      <feature policy=3D'require' name=3D'amd-stibp'/>
       <feature policy=3D'require' name=3D'amd-ssbd'/>
       <feature policy=3D'require' name=3D'virt-ssbd'/>
       <feature policy=3D'require' name=3D'rdctl-no'/>
--=20
2.27.0

From nobody Tue May  7 09:04:14 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 207.211.31.120 as permitted sender) client-ip=207.211.31.120;
 envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-1.mimecast.com;
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 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=1592403561; cv=none;
	d=zohomail.com; s=zohoarc;
	b=Sf8I0CBc4B3i6Tuo7X/UagW1cf15hFAgwoqngxI8SIhV1OBQ9mGxcktGrz9MrC5QPYsDec90BZLQ6q9X+yramw/wm1O6pfAW7djgfLvWn1umBZF1tgJ/KaGdb0pKGt0Yjs9KM7X7mPJWjwL0AC/lqoJC4vbR/RriQKgOQOiDpnA=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1592403561;
 h=Content-Type:Content-Transfer-Encoding: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=b92Oc0mE68uluHb7iV/F/0tLYqq1c1jTk3DWrfsgrlU=;
	b=DCbGg8eJ7syGy/tyg5EE1C56gR0SmnCLt+4e1aSqQA8swR7s1MHbCTr/WoLSGPkyAQD4pmWQtgXh8TDRq80/J4rqtsHqBhYkb7HFhlyA67rlRI0I8s2SR1iIpKxecNPxrWPf4M5R5vWpxrAQxomp/h185LA3vxLtmmpXexMsYdU=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.120 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<jdenemar@redhat.com> (p=none dis=none)
 header.from=<jdenemar@redhat.com>
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com
 [207.211.31.120]) by mx.zohomail.com
	with SMTPS id 1592403560956471.80535126677603;
 Wed, 17 Jun 2020 07:19:20 -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-269-u8KRKN-bMLWX5C-DZlrs0Q-1; Wed, 17 Jun 2020 10:19:16 -0400
Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com
 [10.5.11.15])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 261F081EE3C;
	Wed, 17 Jun 2020 14:19:10 +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 07B867BA19;
	Wed, 17 Jun 2020 14:19:10 +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 CD97E833CE;
	Wed, 17 Jun 2020 14:19:09 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com
	[10.5.11.16])
	by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP
	id 05HEJ2Vh004975 for <libvir-list@listman.util.phx.redhat.com>;
	Wed, 17 Jun 2020 10:19:02 -0400
Received: by smtp.corp.redhat.com (Postfix)
	id B9F525C1D6; Wed, 17 Jun 2020 14:19:02 +0000 (UTC)
Received: from virval.usersys.redhat.com (unknown [10.40.192.20])
	by smtp.corp.redhat.com (Postfix) with ESMTPS id 0E9A45C1D4
	for <libvir-list@redhat.com>; Wed, 17 Jun 2020 14:18:59 +0000 (UTC)
Received: by virval.usersys.redhat.com (Postfix, from userid 500)
	id 026DC2436C0; Wed, 17 Jun 2020 16:18:58 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1592403559;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to: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=b92Oc0mE68uluHb7iV/F/0tLYqq1c1jTk3DWrfsgrlU=;
	b=WdN+WvQIBs/pKFKmu3/d7CVXxch4HxX1wXD6NHaNba6OJIG8AztOjvA1kClUCvvtQq9gLf
	Oy2dNLRKBqECE5jwwRrZ56c2G9hiPG0wisDLzzF021ApZvHfTnhTz/lyHsl4Q37WbqQFo8
	qTy7bxNf1QPOKca+Eo+fXgSY6jvkYyo=
X-MC-Unique: u8KRKN-bMLWX5C-DZlrs0Q-1
From: Jiri Denemark <jdenemar@redhat.com>
To: libvir-list@redhat.com
Subject: [libvirt PATCH 4/4] cpu_map: Add missing AMD SVM features
Date: Wed, 17 Jun 2020 16:18:54 +0200
Message-Id: 
 <9e0a071ac8a0e130d5094959c4183f693d100ad5.1592401703.git.jdenemar@redhat.com>
In-Reply-To: <cover.1592401703.git.jdenemar@redhat.com>
References: <cover.1592401703.git.jdenemar@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16
X-loop: libvir-list@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.79 on 10.5.11.15
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"

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Daniel P. Berrang=C3=A9 <berrange@redhat.com>
---
 src/cpu_map/x86_features.xml                  | 32 +++++++++++++++++++
 .../x86_64-cpuid-A10-5800K-disabled.xml       |  1 +
 .../x86_64-cpuid-A10-5800K-enabled.xml        |  1 +
 .../x86_64-cpuid-A10-5800K-guest.xml          | 10 ++++++
 .../x86_64-cpuid-A10-5800K-host.xml           | 10 ++++++
 .../x86_64-cpuid-A10-5800K-json.xml           |  2 ++
 ...86_64-cpuid-EPYC-7601-32-Core-disabled.xml |  1 +
 ...x86_64-cpuid-EPYC-7601-32-Core-enabled.xml |  1 +
 .../x86_64-cpuid-EPYC-7601-32-Core-guest.xml  | 10 ++++++
 .../x86_64-cpuid-EPYC-7601-32-Core-host.xml   | 10 ++++++
 ...-cpuid-EPYC-7601-32-Core-ibpb-disabled.xml |  1 +
 ...4-cpuid-EPYC-7601-32-Core-ibpb-enabled.xml |  1 +
 ..._64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml | 10 ++++++
 ...6_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml | 10 ++++++
 ...6_64-cpuid-EPYC-7601-32-Core-ibpb-json.xml |  2 ++
 .../x86_64-cpuid-EPYC-7601-32-Core-json.xml   |  2 ++
 .../x86_64-cpuid-FX-8150-guest.xml            | 10 ++++++
 .../cputestdata/x86_64-cpuid-FX-8150-host.xml | 10 ++++++
 ...-cpuid-Hygon-C86-7185-32-core-disabled.xml |  1 +
 ...4-cpuid-Hygon-C86-7185-32-core-enabled.xml |  1 +
 ..._64-cpuid-Hygon-C86-7185-32-core-guest.xml | 10 ++++++
 ...6_64-cpuid-Hygon-C86-7185-32-core-host.xml | 10 ++++++
 ...6_64-cpuid-Hygon-C86-7185-32-core-json.xml |  2 ++
 .../x86_64-cpuid-Opteron-1352-guest.xml       |  3 ++
 .../x86_64-cpuid-Opteron-1352-host.xml        |  3 ++
 .../x86_64-cpuid-Opteron-2350-disabled.xml    |  1 +
 .../x86_64-cpuid-Opteron-2350-enabled.xml     |  1 +
 .../x86_64-cpuid-Opteron-2350-guest.xml       |  3 ++
 .../x86_64-cpuid-Opteron-2350-host.xml        |  3 ++
 .../x86_64-cpuid-Opteron-2350-json.xml        |  1 +
 .../x86_64-cpuid-Opteron-6234-disabled.xml    |  1 +
 .../x86_64-cpuid-Opteron-6234-enabled.xml     |  1 +
 .../x86_64-cpuid-Opteron-6234-guest.xml       | 10 ++++++
 .../x86_64-cpuid-Opteron-6234-host.xml        | 10 ++++++
 .../x86_64-cpuid-Opteron-6234-json.xml        |  2 ++
 .../x86_64-cpuid-Opteron-6282-guest.xml       | 10 ++++++
 .../x86_64-cpuid-Opteron-6282-host.xml        | 10 ++++++
 .../x86_64-cpuid-Phenom-B95-disabled.xml      |  1 +
 .../x86_64-cpuid-Phenom-B95-enabled.xml       |  1 +
 .../x86_64-cpuid-Phenom-B95-guest.xml         |  4 +++
 .../x86_64-cpuid-Phenom-B95-host.xml          |  4 +++
 .../x86_64-cpuid-Phenom-B95-json.xml          |  2 ++
 ...puid-Ryzen-7-1800X-Eight-Core-disabled.xml |  1 +
 ...cpuid-Ryzen-7-1800X-Eight-Core-enabled.xml |  1 +
 ...4-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml | 10 ++++++
 ...64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml | 10 ++++++
 ...64-cpuid-Ryzen-7-1800X-Eight-Core-json.xml |  2 ++
 ...4-cpuid-Ryzen-9-3900X-12-Core-disabled.xml |  1 +
 ...64-cpuid-Ryzen-9-3900X-12-Core-enabled.xml |  1 +
 ...6_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml | 10 ++++++
 ...86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml | 10 ++++++
 ...86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml |  2 ++
 .../domaincapsdata/qemu_3.0.0-tcg.x86_64.xml  |  1 +
 .../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml  |  1 +
 .../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml  |  2 ++
 .../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml  |  2 ++
 .../domaincapsdata/qemu_4.2.0-tcg.x86_64.xml  |  2 ++
 .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml  |  2 ++
 .../domaincapsdata/qemu_5.1.0-q35.x86_64.xml  |  2 ++
 .../domaincapsdata/qemu_5.1.0-tcg.x86_64.xml  |  2 ++
 tests/domaincapsdata/qemu_5.1.0.x86_64.xml    |  2 ++
 .../cpu-host-model-cmt.x86_64-4.0.0.args      |  6 ++--
 62 files changed, 286 insertions(+), 3 deletions(-)

diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index cb250555f6..a55f52b16c 100644
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -515,6 +515,38 @@
     <cpuid eax_in=3D'0x80000008' ebx=3D'0x04000000'/>
   </feature>
=20
+  <!-- SVM features -->
+  <feature name=3D'npt'>
+    <cpuid eax_in=3D'0x8000000a' edx=3D'0x00000001'/>
+  </feature>
+  <feature name=3D'lbrv'>
+    <cpuid eax_in=3D'0x8000000a' edx=3D'0x00000002'/>
+  </feature>
+  <feature name=3D'svm-lock'>
+    <cpuid eax_in=3D'0x8000000a' edx=3D'0x00000004'/>
+  </feature>
+  <feature name=3D'nrip-save'>
+    <cpuid eax_in=3D'0x8000000a' edx=3D'0x00000008'/>
+  </feature>
+  <feature name=3D'tsc-scale'>
+    <cpuid eax_in=3D'0x8000000a' edx=3D'0x00000010'/>
+  </feature>
+  <feature name=3D'vmcb-clean'>
+    <cpuid eax_in=3D'0x8000000a' edx=3D'0x00000020'/>
+  </feature>
+  <feature name=3D'flushbyasid'>
+    <cpuid eax_in=3D'0x8000000a' edx=3D'0x00000040'/>
+  </feature>
+  <feature name=3D'decodeassists'>
+    <cpuid eax_in=3D'0x8000000a' edx=3D'0x00000080'/>
+  </feature>
+  <feature name=3D'pause-filter'>
+    <cpuid eax_in=3D'0x8000000a' edx=3D'0x00000400'/>
+  </feature>
+  <feature name=3D'pfthreshold'>
+    <cpuid eax_in=3D'0x8000000a' edx=3D'0x00001000'/>
+  </feature>
+
   <!-- IA32_ARCH_CAPABILITIES features -->
   <feature name=3D'rdctl-no'>
     <msr index=3D'0x10a' edx=3D'0x00000000' eax=3D'0x00000001'/>
diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-disabled.xml b/tests/=
cputestdata/x86_64-cpuid-A10-5800K-disabled.xml
index 6ed5b3573b..3bacf2cf95 100644
--- a/tests/cputestdata/x86_64-cpuid-A10-5800K-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-disabled.xml
@@ -3,4 +3,5 @@
   <cpuid eax_in=3D'0x00000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x08000008' edx=3D'0x10000000'/>
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x01cab40c' edx=3D'0x08000000'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
+  <cpuid eax_in=3D'0x8000000a' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x000014f6'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-enabled.xml b/tests/c=
putestdata/x86_64-cpuid-A10-5800K-enabled.xml
index 5cae0b7130..f6afbe2cb3 100644
--- a/tests/cputestdata/x86_64-cpuid-A10-5800K-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-enabled.xml
@@ -3,4 +3,5 @@
   <cpuid eax_in=3D'0x00000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0xb6b83203' edx=3D'0x078bfbff'/>
   <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x0000000a' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00210bf3' edx=3D'0x26500800'/>
+  <cpuid eax_in=3D'0x8000000a' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000009'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml b/tests/cpu=
testdata/x86_64-cpuid-A10-5800K-guest.xml
index 98a95e1c41..8401e53d30 100644
--- a/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-guest.xml
@@ -22,4 +22,14 @@
   <feature policy=3D'require' name=3D'perfctr_core'/>
   <feature policy=3D'require' name=3D'perfctr_nb'/>
   <feature policy=3D'require' name=3D'invtsc'/>
+  <feature policy=3D'require' name=3D'npt'/>
+  <feature policy=3D'require' name=3D'lbrv'/>
+  <feature policy=3D'require' name=3D'svm-lock'/>
+  <feature policy=3D'require' name=3D'nrip-save'/>
+  <feature policy=3D'require' name=3D'tsc-scale'/>
+  <feature policy=3D'require' name=3D'vmcb-clean'/>
+  <feature policy=3D'require' name=3D'flushbyasid'/>
+  <feature policy=3D'require' name=3D'decodeassists'/>
+  <feature policy=3D'require' name=3D'pause-filter'/>
+  <feature policy=3D'require' name=3D'pfthreshold'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml b/tests/cput=
estdata/x86_64-cpuid-A10-5800K-host.xml
index cb90c967a3..2430adbfbc 100644
--- a/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-host.xml
@@ -23,4 +23,14 @@
   <feature name=3D'perfctr_core'/>
   <feature name=3D'perfctr_nb'/>
   <feature name=3D'invtsc'/>
+  <feature name=3D'npt'/>
+  <feature name=3D'lbrv'/>
+  <feature name=3D'svm-lock'/>
+  <feature name=3D'nrip-save'/>
+  <feature name=3D'tsc-scale'/>
+  <feature name=3D'vmcb-clean'/>
+  <feature name=3D'flushbyasid'/>
+  <feature name=3D'decodeassists'/>
+  <feature name=3D'pause-filter'/>
+  <feature name=3D'pfthreshold'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml b/tests/cput=
estdata/x86_64-cpuid-A10-5800K-json.xml
index fa61b7b60b..51e6d2b660 100644
--- a/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-A10-5800K-json.xml
@@ -11,6 +11,8 @@
   <feature policy=3D'require' name=3D'cmp_legacy'/>
   <feature policy=3D'require' name=3D'cr8legacy'/>
   <feature policy=3D'require' name=3D'osvw'/>
+  <feature policy=3D'require' name=3D'npt'/>
+  <feature policy=3D'require' name=3D'nrip-save'/>
   <feature policy=3D'disable' name=3D'rdtscp'/>
   <feature policy=3D'disable' name=3D'svm'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-disabled.xml =
b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-disabled.xml
index c26c9c7be3..25ef2d3314 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-disabled.xml
@@ -5,4 +5,5 @@
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x01c2300c' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
   <cpuid eax_in=3D'0x80000008' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000005' ecx=3D'0x00000000' edx=3D'0x00000000'/>
+  <cpuid eax_in=3D'0x8000000a' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x000014f6'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-enabled.xml b=
/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-enabled.xml
index 70b75f7115..e46908e981 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-enabled.xml
@@ -5,4 +5,5 @@
   <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x209c01ab' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x0000000d' ecx_in=3D'0x01' eax=3D'0x00000007' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x000003f3' edx=3D'0x2e500800'/>
+  <cpuid eax_in=3D'0x8000000a' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000009'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml b/t=
ests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml
index 612e571609..0053913327 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-guest.xml
@@ -15,4 +15,14 @@
   <feature policy=3D'require' name=3D'invtsc'/>
   <feature policy=3D'require' name=3D'clzero'/>
   <feature policy=3D'require' name=3D'xsaveerptr'/>
+  <feature policy=3D'require' name=3D'npt'/>
+  <feature policy=3D'require' name=3D'lbrv'/>
+  <feature policy=3D'require' name=3D'svm-lock'/>
+  <feature policy=3D'require' name=3D'nrip-save'/>
+  <feature policy=3D'require' name=3D'tsc-scale'/>
+  <feature policy=3D'require' name=3D'vmcb-clean'/>
+  <feature policy=3D'require' name=3D'flushbyasid'/>
+  <feature policy=3D'require' name=3D'decodeassists'/>
+  <feature policy=3D'require' name=3D'pause-filter'/>
+  <feature policy=3D'require' name=3D'pfthreshold'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml b/te=
sts/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml
index 7498d924e2..7acab0a999 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-host.xml
@@ -16,4 +16,14 @@
   <feature name=3D'invtsc'/>
   <feature name=3D'clzero'/>
   <feature name=3D'xsaveerptr'/>
+  <feature name=3D'npt'/>
+  <feature name=3D'lbrv'/>
+  <feature name=3D'svm-lock'/>
+  <feature name=3D'nrip-save'/>
+  <feature name=3D'tsc-scale'/>
+  <feature name=3D'vmcb-clean'/>
+  <feature name=3D'flushbyasid'/>
+  <feature name=3D'decodeassists'/>
+  <feature name=3D'pause-filter'/>
+  <feature name=3D'pfthreshold'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-disabled=
.xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-disabled.xml
index a7f4fa3f01..f4d92cf034 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-disabled.xml
@@ -5,4 +5,5 @@
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x01c2300c' edx=3D'0x08000000'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
   <cpuid eax_in=3D'0x80000008' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000005' ecx=3D'0x00000000' edx=3D'0x00000000'/>
+  <cpuid eax_in=3D'0x8000000a' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x000014f6'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-enabled.=
xml b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-enabled.xml
index 772456f947..910491c7f6 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-enabled.xml
@@ -6,4 +6,5 @@
   <cpuid eax_in=3D'0x0000000d' ecx_in=3D'0x01' eax=3D'0x00000007' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x000003f3' edx=3D'0x26500800'/>
   <cpuid eax_in=3D'0x80000008' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00001000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
+  <cpuid eax_in=3D'0x8000000a' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000009'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xm=
l b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml
index 96fdea306f..9164987bbd 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-guest.xml
@@ -15,5 +15,15 @@
   <feature policy=3D'require' name=3D'invtsc'/>
   <feature policy=3D'require' name=3D'clzero'/>
   <feature policy=3D'require' name=3D'xsaveerptr'/>
+  <feature policy=3D'require' name=3D'npt'/>
+  <feature policy=3D'require' name=3D'lbrv'/>
+  <feature policy=3D'require' name=3D'svm-lock'/>
+  <feature policy=3D'require' name=3D'nrip-save'/>
+  <feature policy=3D'require' name=3D'tsc-scale'/>
+  <feature policy=3D'require' name=3D'vmcb-clean'/>
+  <feature policy=3D'require' name=3D'flushbyasid'/>
+  <feature policy=3D'require' name=3D'decodeassists'/>
+  <feature policy=3D'require' name=3D'pause-filter'/>
+  <feature policy=3D'require' name=3D'pfthreshold'/>
   <feature policy=3D'disable' name=3D'rdtscp'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml=
 b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml
index 4fff74f3aa..2fa8861e44 100644
--- a/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-EPYC-7601-32-Core-ibpb-host.xml
@@ -16,4 +16,14 @@
   <feature name=3D'invtsc'/>
   <feature name=3D'clzero'/>
   <feature name=3D'xsaveerptr'/>
+  <feature name=3D'npt'/>
+  <feature name=3D'lbrv'/>
+  <feature name=3D'svm-lock'/>
+  <feature name=3D'nrip-save'/>
+  <feature name=3D'tsc-scale'/>
+  <feature name=3D'vmcb-clean'/>
+  <feature name=3D'flushbyasid'/>
+  <feature name=3D'decodeassists'/>
+  <feature name=3D'pause-filter'/>
+  <feature name=3D'pfthreshold'/>
 </cpu>
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 c4e34a0fa1..af1e7f2f32 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
@@ -6,6 +6,8 @@
   <feature policy=3D'require' name=3D'hypervisor'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmp_legacy'/>
+  <feature policy=3D'require' name=3D'npt'/>
+  <feature policy=3D'require' name=3D'nrip-save'/>
   <feature policy=3D'disable' name=3D'monitor'/>
   <feature policy=3D'disable' name=3D'rdtscp'/>
   <feature policy=3D'disable' name=3D'svm'/>
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 7bf2d1b852..4450a40f61 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
@@ -6,6 +6,8 @@
   <feature policy=3D'require' name=3D'hypervisor'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmp_legacy'/>
+  <feature policy=3D'require' name=3D'npt'/>
+  <feature policy=3D'require' name=3D'nrip-save'/>
   <feature policy=3D'disable' name=3D'monitor'/>
   <feature policy=3D'disable' name=3D'svm'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml b/tests/cpute=
stdata/x86_64-cpuid-FX-8150-guest.xml
index 6bd032bbcb..ee34ea8547 100644
--- a/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-FX-8150-guest.xml
@@ -20,4 +20,14 @@
   <feature policy=3D'require' name=3D'perfctr_core'/>
   <feature policy=3D'require' name=3D'perfctr_nb'/>
   <feature policy=3D'require' name=3D'invtsc'/>
+  <feature policy=3D'require' name=3D'npt'/>
+  <feature policy=3D'require' name=3D'lbrv'/>
+  <feature policy=3D'require' name=3D'svm-lock'/>
+  <feature policy=3D'require' name=3D'nrip-save'/>
+  <feature policy=3D'require' name=3D'tsc-scale'/>
+  <feature policy=3D'require' name=3D'vmcb-clean'/>
+  <feature policy=3D'require' name=3D'flushbyasid'/>
+  <feature policy=3D'require' name=3D'decodeassists'/>
+  <feature policy=3D'require' name=3D'pause-filter'/>
+  <feature policy=3D'require' name=3D'pfthreshold'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml b/tests/cputes=
tdata/x86_64-cpuid-FX-8150-host.xml
index ec670c612e..75595c02af 100644
--- a/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-FX-8150-host.xml
@@ -21,4 +21,14 @@
   <feature name=3D'perfctr_core'/>
   <feature name=3D'perfctr_nb'/>
   <feature name=3D'invtsc'/>
+  <feature name=3D'npt'/>
+  <feature name=3D'lbrv'/>
+  <feature name=3D'svm-lock'/>
+  <feature name=3D'nrip-save'/>
+  <feature name=3D'tsc-scale'/>
+  <feature name=3D'vmcb-clean'/>
+  <feature name=3D'flushbyasid'/>
+  <feature name=3D'decodeassists'/>
+  <feature name=3D'pause-filter'/>
+  <feature name=3D'pfthreshold'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-disabled=
.xml b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-disabled.xml
index c26c9c7be3..25ef2d3314 100644
--- a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-disabled.xml
@@ -5,4 +5,5 @@
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x01c2300c' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
   <cpuid eax_in=3D'0x80000008' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000005' ecx=3D'0x00000000' edx=3D'0x00000000'/>
+  <cpuid eax_in=3D'0x8000000a' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x000014f6'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-enabled.=
xml b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-enabled.xml
index fcefcf73c8..9181c3a9fe 100644
--- a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-enabled.xml
@@ -6,4 +6,5 @@
   <cpuid eax_in=3D'0x0000000d' ecx_in=3D'0x01' eax=3D'0x00000007' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x000003f3' edx=3D'0x2e500800'/>
   <cpuid eax_in=3D'0x80000008' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02001000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
+  <cpuid eax_in=3D'0x8000000a' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000009'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xm=
l b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml
index 844b8b9d4f..08c574255e 100644
--- a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-guest.xml
@@ -15,4 +15,14 @@
   <feature policy=3D'require' name=3D'invtsc'/>
   <feature policy=3D'require' name=3D'clzero'/>
   <feature policy=3D'require' name=3D'xsaveerptr'/>
+  <feature policy=3D'require' name=3D'npt'/>
+  <feature policy=3D'require' name=3D'lbrv'/>
+  <feature policy=3D'require' name=3D'svm-lock'/>
+  <feature policy=3D'require' name=3D'nrip-save'/>
+  <feature policy=3D'require' name=3D'tsc-scale'/>
+  <feature policy=3D'require' name=3D'vmcb-clean'/>
+  <feature policy=3D'require' name=3D'flushbyasid'/>
+  <feature policy=3D'require' name=3D'decodeassists'/>
+  <feature policy=3D'require' name=3D'pause-filter'/>
+  <feature policy=3D'require' name=3D'pfthreshold'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml=
 b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml
index 3d1b143eba..f1cddb6a19 100644
--- a/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Hygon-C86-7185-32-core-host.xml
@@ -16,4 +16,14 @@
   <feature name=3D'invtsc'/>
   <feature name=3D'clzero'/>
   <feature name=3D'xsaveerptr'/>
+  <feature name=3D'npt'/>
+  <feature name=3D'lbrv'/>
+  <feature name=3D'svm-lock'/>
+  <feature name=3D'nrip-save'/>
+  <feature name=3D'tsc-scale'/>
+  <feature name=3D'vmcb-clean'/>
+  <feature name=3D'flushbyasid'/>
+  <feature name=3D'decodeassists'/>
+  <feature name=3D'pause-filter'/>
+  <feature name=3D'pfthreshold'/>
 </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 d3003b6965..0fdd934c08 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
@@ -7,6 +7,8 @@
   <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'require' name=3D'npt'/>
+  <feature policy=3D'require' name=3D'nrip-save'/>
   <feature policy=3D'disable' name=3D'monitor'/>
   <feature policy=3D'disable' name=3D'svm'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml b/tests/=
cputestdata/x86_64-cpuid-Opteron-1352-guest.xml
index 652f1e4333..a52c4cd303 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-1352-guest.xml
@@ -15,4 +15,7 @@
   <feature policy=3D'require' name=3D'osvw'/>
   <feature policy=3D'require' name=3D'ibs'/>
   <feature policy=3D'require' name=3D'invtsc'/>
+  <feature policy=3D'require' name=3D'npt'/>
+  <feature policy=3D'require' name=3D'lbrv'/>
+  <feature policy=3D'require' name=3D'svm-lock'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml b/tests/c=
putestdata/x86_64-cpuid-Opteron-1352-host.xml
index 399398eb3a..800b092f14 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-1352-host.xml
@@ -16,4 +16,7 @@
   <feature name=3D'osvw'/>
   <feature name=3D'ibs'/>
   <feature name=3D'invtsc'/>
+  <feature name=3D'npt'/>
+  <feature name=3D'lbrv'/>
+  <feature name=3D'svm-lock'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-disabled.xml b/tes=
ts/cputestdata/x86_64-cpuid-Opteron-2350-disabled.xml
index 8ec1b12582..3f6fe54055 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-disabled.xml
@@ -3,4 +3,5 @@
   <cpuid eax_in=3D'0x00000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000008' edx=3D'0x10000000'/>
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000408' edx=3D'0x08000000'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
+  <cpuid eax_in=3D'0x8000000a' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000006'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-enabled.xml b/test=
s/cputestdata/x86_64-cpuid-Opteron-2350-enabled.xml
index 913980f15f..5fd0d6066d 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-enabled.xml
@@ -2,4 +2,5 @@
 <cpudata arch=3D'x86'>
   <cpuid eax_in=3D'0x00000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x81a02001' edx=3D'0x078bfbff'/>
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x000003f7' edx=3D'0xe6500800'/>
+  <cpuid eax_in=3D'0x8000000a' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000001'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml b/tests/=
cputestdata/x86_64-cpuid-Opteron-2350-guest.xml
index 652f1e4333..a52c4cd303 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-guest.xml
@@ -15,4 +15,7 @@
   <feature policy=3D'require' name=3D'osvw'/>
   <feature policy=3D'require' name=3D'ibs'/>
   <feature policy=3D'require' name=3D'invtsc'/>
+  <feature policy=3D'require' name=3D'npt'/>
+  <feature policy=3D'require' name=3D'lbrv'/>
+  <feature policy=3D'require' name=3D'svm-lock'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml b/tests/c=
putestdata/x86_64-cpuid-Opteron-2350-host.xml
index 399398eb3a..800b092f14 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-host.xml
@@ -16,4 +16,7 @@
   <feature name=3D'osvw'/>
   <feature name=3D'ibs'/>
   <feature name=3D'invtsc'/>
+  <feature name=3D'npt'/>
+  <feature name=3D'lbrv'/>
+  <feature name=3D'svm-lock'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml b/tests/c=
putestdata/x86_64-cpuid-Opteron-2350-json.xml
index 741757aeb2..d128553c13 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-2350-json.xml
@@ -14,6 +14,7 @@
   <feature policy=3D'require' name=3D'cr8legacy'/>
   <feature policy=3D'require' name=3D'3dnowprefetch'/>
   <feature policy=3D'require' name=3D'osvw'/>
+  <feature policy=3D'require' name=3D'npt'/>
   <feature policy=3D'disable' name=3D'monitor'/>
   <feature policy=3D'disable' name=3D'rdtscp'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-disabled.xml b/tes=
ts/cputestdata/x86_64-cpuid-Opteron-6234-disabled.xml
index 88124d1745..4dcd74103b 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-disabled.xml
@@ -3,4 +3,5 @@
   <cpuid eax_in=3D'0x00000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x08000008' edx=3D'0x10000000'/>
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x01c8b40c' edx=3D'0x08000000'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
+  <cpuid eax_in=3D'0x8000000a' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x000014f6'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-enabled.xml b/test=
s/cputestdata/x86_64-cpuid-Opteron-6234-enabled.xml
index 38d716449d..890b5df060 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-enabled.xml
@@ -4,4 +4,5 @@
   <cpuid eax_in=3D'0x00000006' ecx_in=3D'0x00' eax=3D'0x00000004' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000002' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00010bf3' edx=3D'0x26500800'/>
+  <cpuid eax_in=3D'0x8000000a' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000009'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml b/tests/=
cputestdata/x86_64-cpuid-Opteron-6234-guest.xml
index 6bd032bbcb..ee34ea8547 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-guest.xml
@@ -20,4 +20,14 @@
   <feature policy=3D'require' name=3D'perfctr_core'/>
   <feature policy=3D'require' name=3D'perfctr_nb'/>
   <feature policy=3D'require' name=3D'invtsc'/>
+  <feature policy=3D'require' name=3D'npt'/>
+  <feature policy=3D'require' name=3D'lbrv'/>
+  <feature policy=3D'require' name=3D'svm-lock'/>
+  <feature policy=3D'require' name=3D'nrip-save'/>
+  <feature policy=3D'require' name=3D'tsc-scale'/>
+  <feature policy=3D'require' name=3D'vmcb-clean'/>
+  <feature policy=3D'require' name=3D'flushbyasid'/>
+  <feature policy=3D'require' name=3D'decodeassists'/>
+  <feature policy=3D'require' name=3D'pause-filter'/>
+  <feature policy=3D'require' name=3D'pfthreshold'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml b/tests/c=
putestdata/x86_64-cpuid-Opteron-6234-host.xml
index ec670c612e..75595c02af 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-host.xml
@@ -21,4 +21,14 @@
   <feature name=3D'perfctr_core'/>
   <feature name=3D'perfctr_nb'/>
   <feature name=3D'invtsc'/>
+  <feature name=3D'npt'/>
+  <feature name=3D'lbrv'/>
+  <feature name=3D'svm-lock'/>
+  <feature name=3D'nrip-save'/>
+  <feature name=3D'tsc-scale'/>
+  <feature name=3D'vmcb-clean'/>
+  <feature name=3D'flushbyasid'/>
+  <feature name=3D'decodeassists'/>
+  <feature name=3D'pause-filter'/>
+  <feature name=3D'pfthreshold'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml b/tests/c=
putestdata/x86_64-cpuid-Opteron-6234-json.xml
index 2ad3c98a5a..abfc8db290 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6234-json.xml
@@ -12,6 +12,8 @@
   <feature policy=3D'require' name=3D'cmp_legacy'/>
   <feature policy=3D'require' name=3D'cr8legacy'/>
   <feature policy=3D'require' name=3D'osvw'/>
+  <feature policy=3D'require' name=3D'npt'/>
+  <feature policy=3D'require' name=3D'nrip-save'/>
   <feature policy=3D'disable' name=3D'rdtscp'/>
   <feature policy=3D'disable' name=3D'svm'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml b/tests/=
cputestdata/x86_64-cpuid-Opteron-6282-guest.xml
index 6bd032bbcb..ee34ea8547 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6282-guest.xml
@@ -20,4 +20,14 @@
   <feature policy=3D'require' name=3D'perfctr_core'/>
   <feature policy=3D'require' name=3D'perfctr_nb'/>
   <feature policy=3D'require' name=3D'invtsc'/>
+  <feature policy=3D'require' name=3D'npt'/>
+  <feature policy=3D'require' name=3D'lbrv'/>
+  <feature policy=3D'require' name=3D'svm-lock'/>
+  <feature policy=3D'require' name=3D'nrip-save'/>
+  <feature policy=3D'require' name=3D'tsc-scale'/>
+  <feature policy=3D'require' name=3D'vmcb-clean'/>
+  <feature policy=3D'require' name=3D'flushbyasid'/>
+  <feature policy=3D'require' name=3D'decodeassists'/>
+  <feature policy=3D'require' name=3D'pause-filter'/>
+  <feature policy=3D'require' name=3D'pfthreshold'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml b/tests/c=
putestdata/x86_64-cpuid-Opteron-6282-host.xml
index ec670c612e..75595c02af 100644
--- a/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Opteron-6282-host.xml
@@ -21,4 +21,14 @@
   <feature name=3D'perfctr_core'/>
   <feature name=3D'perfctr_nb'/>
   <feature name=3D'invtsc'/>
+  <feature name=3D'npt'/>
+  <feature name=3D'lbrv'/>
+  <feature name=3D'svm-lock'/>
+  <feature name=3D'nrip-save'/>
+  <feature name=3D'tsc-scale'/>
+  <feature name=3D'vmcb-clean'/>
+  <feature name=3D'flushbyasid'/>
+  <feature name=3D'decodeassists'/>
+  <feature name=3D'pause-filter'/>
+  <feature name=3D'pfthreshold'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-disabled.xml b/tests=
/cputestdata/x86_64-cpuid-Phenom-B95-disabled.xml
index d8d4e8a5f9..3910eb6e57 100644
--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-disabled.xml
@@ -3,4 +3,5 @@
   <cpuid eax_in=3D'0x00000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000008' edx=3D'0x10000000'/>
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x0000340c' edx=3D'0x08000000'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
+  <cpuid eax_in=3D'0x8000000a' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000006'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-enabled.xml b/tests/=
cputestdata/x86_64-cpuid-Phenom-B95-enabled.xml
index d15e625087..2a090a04d8 100644
--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-enabled.xml
@@ -2,4 +2,5 @@
 <cpudata arch=3D'x86'>
   <cpuid eax_in=3D'0x00000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x80a02001' edx=3D'0x078bfbff'/>
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x000003f3' edx=3D'0xe6400800'/>
+  <cpuid eax_in=3D'0x8000000a' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000009'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml b/tests/cp=
utestdata/x86_64-cpuid-Phenom-B95-guest.xml
index d7a06108bc..ab0e99f97d 100644
--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-guest.xml
@@ -17,5 +17,9 @@
   <feature policy=3D'require' name=3D'skinit'/>
   <feature policy=3D'require' name=3D'wdt'/>
   <feature policy=3D'require' name=3D'invtsc'/>
+  <feature policy=3D'require' name=3D'npt'/>
+  <feature policy=3D'require' name=3D'lbrv'/>
+  <feature policy=3D'require' name=3D'svm-lock'/>
+  <feature policy=3D'require' name=3D'nrip-save'/>
   <feature policy=3D'disable' name=3D'nx'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml b/tests/cpu=
testdata/x86_64-cpuid-Phenom-B95-host.xml
index 127b047854..95875918c9 100644
--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-host.xml
@@ -28,4 +28,8 @@
   <feature name=3D'skinit'/>
   <feature name=3D'wdt'/>
   <feature name=3D'invtsc'/>
+  <feature name=3D'npt'/>
+  <feature name=3D'lbrv'/>
+  <feature name=3D'svm-lock'/>
+  <feature name=3D'nrip-save'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml b/tests/cpu=
testdata/x86_64-cpuid-Phenom-B95-json.xml
index 7ce56ac8e7..d161709981 100644
--- a/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Phenom-B95-json.xml
@@ -13,6 +13,8 @@
   <feature policy=3D'require' name=3D'cr8legacy'/>
   <feature policy=3D'require' name=3D'3dnowprefetch'/>
   <feature policy=3D'require' name=3D'osvw'/>
+  <feature policy=3D'require' name=3D'npt'/>
+  <feature policy=3D'require' name=3D'nrip-save'/>
   <feature policy=3D'disable' name=3D'monitor'/>
   <feature policy=3D'disable' name=3D'nx'/>
   <feature policy=3D'disable' name=3D'rdtscp'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-disabl=
ed.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-disabled.x=
ml
index 0358ecf478..a63cd5c4b4 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-disabled.xml
@@ -6,4 +6,5 @@
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x01c23008' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
   <cpuid eax_in=3D'0x80000008' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000005' ecx=3D'0x00000000' edx=3D'0x00000000'/>
+  <cpuid eax_in=3D'0x8000000a' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x000014f6'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-enable=
d.xml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-enabled.xml
index a212679fba..f1a0ad3315 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-enabled.xml
@@ -5,4 +5,5 @@
   <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x009c01ab' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x0000000d' ecx_in=3D'0x01' eax=3D'0x00000007' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x000003f7' edx=3D'0x2e500800'/>
+  <cpuid eax_in=3D'0x8000000a' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000009'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.=
xml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml
index 612e571609..0053913327 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-guest.xml
@@ -15,4 +15,14 @@
   <feature policy=3D'require' name=3D'invtsc'/>
   <feature policy=3D'require' name=3D'clzero'/>
   <feature policy=3D'require' name=3D'xsaveerptr'/>
+  <feature policy=3D'require' name=3D'npt'/>
+  <feature policy=3D'require' name=3D'lbrv'/>
+  <feature policy=3D'require' name=3D'svm-lock'/>
+  <feature policy=3D'require' name=3D'nrip-save'/>
+  <feature policy=3D'require' name=3D'tsc-scale'/>
+  <feature policy=3D'require' name=3D'vmcb-clean'/>
+  <feature policy=3D'require' name=3D'flushbyasid'/>
+  <feature policy=3D'require' name=3D'decodeassists'/>
+  <feature policy=3D'require' name=3D'pause-filter'/>
+  <feature policy=3D'require' name=3D'pfthreshold'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.x=
ml b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml
index 7498d924e2..7acab0a999 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-7-1800X-Eight-Core-host.xml
@@ -16,4 +16,14 @@
   <feature name=3D'invtsc'/>
   <feature name=3D'clzero'/>
   <feature name=3D'xsaveerptr'/>
+  <feature name=3D'npt'/>
+  <feature name=3D'lbrv'/>
+  <feature name=3D'svm-lock'/>
+  <feature name=3D'nrip-save'/>
+  <feature name=3D'tsc-scale'/>
+  <feature name=3D'vmcb-clean'/>
+  <feature name=3D'flushbyasid'/>
+  <feature name=3D'decodeassists'/>
+  <feature name=3D'pause-filter'/>
+  <feature name=3D'pfthreshold'/>
 </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 32064548c7..aecc335c1e 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
@@ -6,6 +6,8 @@
   <feature policy=3D'require' name=3D'hypervisor'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmp_legacy'/>
+  <feature policy=3D'require' name=3D'npt'/>
+  <feature policy=3D'require' name=3D'nrip-save'/>
   <feature policy=3D'disable' name=3D'monitor'/>
   <feature policy=3D'disable' name=3D'sha-ni'/>
 </cpu>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-disabled.=
xml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-disabled.xml
index c7107c2488..869659cc80 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-disabled.xml
@@ -6,4 +6,5 @@
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x01423408' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000100'/>
   <cpuid eax_in=3D'0x80000008' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00008000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
+  <cpuid eax_in=3D'0x8000000a' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x000014f6'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-enabled.x=
ml b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-enabled.xml
index ce0665bf59..7458db25ab 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-enabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-enabled.xml
@@ -6,5 +6,6 @@
   <cpuid eax_in=3D'0x0000000d' ecx_in=3D'0x01' eax=3D'0x0000000f' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x80000001' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x008003f7' edx=3D'0x2e500800'/>
   <cpuid eax_in=3D'0x80000008' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x03001205' ecx=3D'0x00000000' edx=3D'0x00000000'/>
+  <cpuid eax_in=3D'0x8000000a' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x00000000' edx=3D'0x00000009'/>
   <msr index=3D'0x10a' edx=3D'0x00000000' eax=3D'0x00000069'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml=
 b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml
index 7978231383..1320f65a58 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-guest.xml
@@ -25,6 +25,16 @@
   <feature policy=3D'require' name=3D'wbnoinvd'/>
   <feature policy=3D'require' name=3D'amd-stibp'/>
   <feature policy=3D'require' name=3D'amd-ssbd'/>
+  <feature policy=3D'require' name=3D'npt'/>
+  <feature policy=3D'require' name=3D'lbrv'/>
+  <feature policy=3D'require' name=3D'svm-lock'/>
+  <feature policy=3D'require' name=3D'nrip-save'/>
+  <feature policy=3D'require' name=3D'tsc-scale'/>
+  <feature policy=3D'require' name=3D'vmcb-clean'/>
+  <feature policy=3D'require' name=3D'flushbyasid'/>
+  <feature policy=3D'require' name=3D'decodeassists'/>
+  <feature policy=3D'require' name=3D'pause-filter'/>
+  <feature policy=3D'require' name=3D'pfthreshold'/>
   <feature policy=3D'require' name=3D'rdctl-no'/>
   <feature policy=3D'require' name=3D'skip-l1dfl-vmentry'/>
   <feature policy=3D'require' name=3D'mds-no'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml =
b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml
index 478d5b7ab5..37905ec812 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-host.xml
@@ -26,6 +26,16 @@
   <feature name=3D'wbnoinvd'/>
   <feature name=3D'amd-stibp'/>
   <feature name=3D'amd-ssbd'/>
+  <feature name=3D'npt'/>
+  <feature name=3D'lbrv'/>
+  <feature name=3D'svm-lock'/>
+  <feature name=3D'nrip-save'/>
+  <feature name=3D'tsc-scale'/>
+  <feature name=3D'vmcb-clean'/>
+  <feature name=3D'flushbyasid'/>
+  <feature name=3D'decodeassists'/>
+  <feature name=3D'pause-filter'/>
+  <feature name=3D'pfthreshold'/>
   <feature name=3D'rdctl-no'/>
   <feature name=3D'skip-l1dfl-vmentry'/>
   <feature name=3D'mds-no'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml =
b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml
index a64e9fe1e5..fba378e030 100644
--- a/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ryzen-9-3900X-12-Core-json.xml
@@ -19,6 +19,8 @@
   <feature policy=3D'require' name=3D'wbnoinvd'/>
   <feature policy=3D'require' name=3D'amd-ssbd'/>
   <feature policy=3D'require' name=3D'virt-ssbd'/>
+  <feature policy=3D'require' name=3D'npt'/>
+  <feature policy=3D'require' name=3D'nrip-save'/>
   <feature policy=3D'require' name=3D'rdctl-no'/>
   <feature policy=3D'require' name=3D'skip-l1dfl-vmentry'/>
   <feature policy=3D'require' name=3D'mds-no'/>
diff --git a/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_3.0.0-tcg.x86_64.xml
index d369fa827a..d3211e7a13 100644
--- a/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.0.0-tcg.x86_64.xml
@@ -43,6 +43,7 @@
       <feature policy=3D'require' name=3D'la57'/>
       <feature policy=3D'require' name=3D'3dnowext'/>
       <feature policy=3D'require' name=3D'3dnow'/>
+      <feature policy=3D'require' name=3D'npt'/>
       <feature policy=3D'disable' name=3D'vme'/>
       <feature policy=3D'disable' name=3D'fma'/>
       <feature policy=3D'disable' name=3D'avx'/>
diff --git a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_3.1.0-tcg.x86_64.xml
index 444d90504e..756b28034e 100644
--- a/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
@@ -43,6 +43,7 @@
       <feature policy=3D'require' name=3D'la57'/>
       <feature policy=3D'require' name=3D'3dnowext'/>
       <feature policy=3D'require' name=3D'3dnow'/>
+      <feature policy=3D'require' name=3D'npt'/>
       <feature policy=3D'disable' name=3D'vme'/>
       <feature policy=3D'disable' name=3D'fma'/>
       <feature policy=3D'disable' name=3D'avx'/>
diff --git a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_4.0.0-tcg.x86_64.xml
index 463f0db390..0aa8aa18be 100644
--- a/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
@@ -43,6 +43,7 @@
       <feature policy=3D'require' name=3D'la57'/>
       <feature policy=3D'require' name=3D'3dnowext'/>
       <feature policy=3D'require' name=3D'3dnow'/>
+      <feature policy=3D'require' name=3D'npt'/>
       <feature policy=3D'disable' name=3D'vme'/>
       <feature policy=3D'disable' name=3D'fma'/>
       <feature policy=3D'disable' name=3D'avx'/>
@@ -57,6 +58,7 @@
       <feature policy=3D'disable' name=3D'3dnowprefetch'/>
       <feature policy=3D'disable' name=3D'osvw'/>
       <feature policy=3D'disable' name=3D'topoext'/>
+      <feature policy=3D'disable' name=3D'nrip-save'/>
     </mode>
     <mode name=3D'custom' supported=3D'yes'>
       <model usable=3D'yes'>qemu64</model>
diff --git a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_4.1.0-tcg.x86_64.xml
index 5bfd065986..d6265ce243 100644
--- a/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
@@ -43,6 +43,7 @@
       <feature policy=3D'require' name=3D'la57'/>
       <feature policy=3D'require' name=3D'3dnowext'/>
       <feature policy=3D'require' name=3D'3dnow'/>
+      <feature policy=3D'require' name=3D'npt'/>
       <feature policy=3D'disable' name=3D'vme'/>
       <feature policy=3D'disable' name=3D'fma'/>
       <feature policy=3D'disable' name=3D'avx'/>
@@ -57,6 +58,7 @@
       <feature policy=3D'disable' name=3D'osvw'/>
       <feature policy=3D'disable' name=3D'topoext'/>
       <feature policy=3D'disable' name=3D'ibpb'/>
+      <feature policy=3D'disable' name=3D'nrip-save'/>
     </mode>
     <mode name=3D'custom' supported=3D'yes'>
       <model usable=3D'yes'>qemu64</model>
diff --git a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_4.2.0-tcg.x86_64.xml
index a348c7f2fc..7339a3f81c 100644
--- a/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml
@@ -43,6 +43,7 @@
       <feature policy=3D'require' name=3D'la57'/>
       <feature policy=3D'require' name=3D'3dnowext'/>
       <feature policy=3D'require' name=3D'3dnow'/>
+      <feature policy=3D'require' name=3D'npt'/>
       <feature policy=3D'disable' name=3D'vme'/>
       <feature policy=3D'disable' name=3D'fma'/>
       <feature policy=3D'disable' name=3D'avx'/>
@@ -57,6 +58,7 @@
       <feature policy=3D'disable' name=3D'osvw'/>
       <feature policy=3D'disable' name=3D'topoext'/>
       <feature policy=3D'disable' name=3D'ibpb'/>
+      <feature policy=3D'disable' name=3D'nrip-save'/>
     </mode>
     <mode name=3D'custom' supported=3D'yes'>
       <model usable=3D'yes'>qemu64</model>
diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_5.0.0-tcg.x86_64.xml
index a0eeed7c2d..110a79dd34 100644
--- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
@@ -43,6 +43,7 @@
       <feature policy=3D'require' name=3D'la57'/>
       <feature policy=3D'require' name=3D'3dnowext'/>
       <feature policy=3D'require' name=3D'3dnow'/>
+      <feature policy=3D'require' name=3D'npt'/>
       <feature policy=3D'disable' name=3D'vme'/>
       <feature policy=3D'disable' name=3D'fma'/>
       <feature policy=3D'disable' name=3D'avx'/>
@@ -56,6 +57,7 @@
       <feature policy=3D'disable' name=3D'3dnowprefetch'/>
       <feature policy=3D'disable' name=3D'osvw'/>
       <feature policy=3D'disable' name=3D'topoext'/>
+      <feature policy=3D'disable' name=3D'nrip-save'/>
     </mode>
     <mode name=3D'custom' supported=3D'yes'>
       <model usable=3D'yes'>qemu64</model>
diff --git a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml b/tests/domainc=
apsdata/qemu_5.1.0-q35.x86_64.xml
index 43a2142a9f..e1762611c5 100644
--- a/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-q35.x86_64.xml
@@ -58,6 +58,8 @@
       <feature policy=3D'require' name=3D'amd-stibp'/>
       <feature policy=3D'require' name=3D'amd-ssbd'/>
       <feature policy=3D'require' name=3D'virt-ssbd'/>
+      <feature policy=3D'require' name=3D'npt'/>
+      <feature policy=3D'require' name=3D'nrip-save'/>
       <feature policy=3D'require' name=3D'rdctl-no'/>
       <feature policy=3D'require' name=3D'skip-l1dfl-vmentry'/>
       <feature policy=3D'require' name=3D'mds-no'/>
diff --git a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_5.1.0-tcg.x86_64.xml
index e4801b2750..86f091d238 100644
--- a/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0-tcg.x86_64.xml
@@ -43,6 +43,7 @@
       <feature policy=3D'require' name=3D'la57'/>
       <feature policy=3D'require' name=3D'3dnowext'/>
       <feature policy=3D'require' name=3D'3dnow'/>
+      <feature policy=3D'require' name=3D'npt'/>
       <feature policy=3D'disable' name=3D'vme'/>
       <feature policy=3D'disable' name=3D'fma'/>
       <feature policy=3D'disable' name=3D'avx'/>
@@ -56,6 +57,7 @@
       <feature policy=3D'disable' name=3D'3dnowprefetch'/>
       <feature policy=3D'disable' name=3D'osvw'/>
       <feature policy=3D'disable' name=3D'topoext'/>
+      <feature policy=3D'disable' name=3D'nrip-save'/>
     </mode>
     <mode name=3D'custom' supported=3D'yes'>
       <model usable=3D'yes'>qemu64</model>
diff --git a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml b/tests/domaincapsd=
ata/qemu_5.1.0.x86_64.xml
index aeede0bac6..117f316b6a 100644
--- a/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.1.0.x86_64.xml
@@ -57,6 +57,8 @@
       <feature policy=3D'require' name=3D'amd-stibp'/>
       <feature policy=3D'require' name=3D'amd-ssbd'/>
       <feature policy=3D'require' name=3D'virt-ssbd'/>
+      <feature policy=3D'require' name=3D'npt'/>
+      <feature policy=3D'require' name=3D'nrip-save'/>
       <feature policy=3D'require' name=3D'rdctl-no'/>
       <feature policy=3D'require' name=3D'skip-l1dfl-vmentry'/>
       <feature policy=3D'require' name=3D'mds-no'/>
diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args b/=
tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args
index b44dc2ec48..6ee7bed18e 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args
@@ -14,9 +14,9 @@ QEMU_AUDIO_DRV=3Dnone \
 file=3D/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -machine pc-i440fx-4.0,accel=3Dtcg,usb=3Doff,dump-guest-core=3Doff \
 -cpu EPYC,acpi=3Don,ss=3Don,hypervisor=3Don,erms=3Don,mpx=3Don,pcommit=3Do=
n,clwb=3Don,pku=3Don,\
-la57=3Don,3dnowext=3Don,3dnow=3Don,vme=3Doff,fma=3Doff,avx=3Doff,f16c=3Dof=
f,rdrand=3Doff,\
-avx2=3Doff,rdseed=3Doff,sha-ni=3Doff,xsavec=3Doff,fxsr_opt=3Doff,misaligns=
se=3Doff,\
-3dnowprefetch=3Doff,osvw=3Doff,topoext=3Doff \
+la57=3Don,3dnowext=3Don,3dnow=3Don,npt=3Don,vme=3Doff,fma=3Doff,avx=3Doff,=
f16c=3Doff,\
+rdrand=3Doff,avx2=3Doff,rdseed=3Doff,sha-ni=3Doff,xsavec=3Doff,fxsr_opt=3D=
off,\
+misalignsse=3Doff,3dnowprefetch=3Doff,osvw=3Doff,topoext=3Doff,nrip-save=
=3Doff \
 -m 214 \
 -overcommit mem-lock=3Doff \
 -smp 6,sockets=3D6,cores=3D1,threads=3D1 \
--=20
2.27.0