From nobody Sat Jan  4 23:11:28 2025
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates
 8.43.85.245 as permitted sender) client-ip=8.43.85.245;
 envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org;
Authentication-Results: mx.zohomail.com;
	dkim=fail;
	spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as
 permitted sender)  smtp.mailfrom=devel-bounces@lists.libvirt.org;
	dmarc=fail(p=none dis=none)  header.from=redhat.com
Return-Path: <devel-bounces@lists.libvirt.org>
Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by
 mx.zohomail.com
	with SMTPS id 1734528570293865.1504357465045;
 Wed, 18 Dec 2024 05:29:30 -0800 (PST)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id 075C21642; Wed, 18 Dec 2024 08:29:28 -0500 (EST)
Received: from lists.libvirt.org (localhost [IPv6:::1])
	by lists.libvirt.org (Postfix) with ESMTP id 62E0516D4;
	Wed, 18 Dec 2024 08:24:16 -0500 (EST)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id D17B315BC; Wed, 18 Dec 2024 08:24:08 -0500 (EST)
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.129.124])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by lists.libvirt.org (Postfix) with ESMTPS id 3BE331666
	for <devel@lists.libvirt.org>; Wed, 18 Dec 2024 08:23:39 -0500 (EST)
Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com
 (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by
 relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,
 cipher=TLS_AES_256_GCM_SHA384) id us-mta-695-pC-bZxkAMeG-AgLeywpIHw-1; Wed,
 18 Dec 2024 08:23:37 -0500
Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com
 (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest
 SHA256)
	(No client certificate requested)
	by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS
 id 9EC811955D4C
	for <devel@lists.libvirt.org>; Wed, 18 Dec 2024 13:23:36 +0000 (UTC)
Received: from orkuz (unknown [10.43.3.115])
	by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP
 id E4562195608A
	for <devel@lists.libvirt.org>; Wed, 18 Dec 2024 13:23:35 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org
X-Spam-Level: 
X-Spam-Status: No, score=-1.7 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED,
	HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,
	RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_RPBL_BLOCKED,
	RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_HELO_NONE autolearn=unavailable
	autolearn_force=no version=3.4.4
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1734528218;
	h=from:from: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;
	bh=gewPYfRrD29Ks/2MZChWx9ncModl72RLrDoyFDGpGWw=;
	b=E5oBsTZJ7vgyW+Rw5mK6DXAwDshNqYxcvDDMnssEEngrc/6bDvD+2SSrlDswP2E/UdU25o
	vSqqW5quxebckBiGkGrRcvWcYSEs+0rXObRn2xwmk1TiGTtIkIqADs2akJx9+ncpIyJ0BF
	B3VVO91MmcPlyRZ7wtQ8hVkEMtSj9fU=
X-MC-Unique: pC-bZxkAMeG-AgLeywpIHw-1
X-Mimecast-MFC-AGG-ID: pC-bZxkAMeG-AgLeywpIHw
From: Jiri Denemark <jdenemar@redhat.com>
To: devel@lists.libvirt.org
Subject: [PATCH 5/7] cpu_map: Add zero-fcs-fds CPU feature
Date: Wed, 18 Dec 2024 14:23:21 +0100
Message-ID: 
 <7f190ba29c49b9883801a2d76df4a8cb8f747be9.1734528147.git.jdenemar@redhat.com>
In-Reply-To: <cover.1734528147.git.jdenemar@redhat.com>
References: <cover.1734528147.git.jdenemar@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15
X-Mimecast-Spam-Score: 0
X-Mimecast-MFC-PROC-ID: JR1RJ2rpFdrho_hJVbIADBZHDxS287TTxIwPavWtOQM_1734528216
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
Message-ID-Hash: BQTVMRJ4DJDRJO2JEK2MQ5NVL65DJUSO
X-Message-ID-Hash: BQTVMRJ4DJDRJO2JEK2MQ5NVL65DJUSO
X-MailFrom: jdenemar@redhat.com
X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency;
 loop; banned-address; member-moderation; header-match-config-1;
 header-match-config-2; header-match-config-3;
 header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia;
 implicit-dest; max-recipients; max-size; news-moderation; no-subject;
 suspicious-header
X-Mailman-Version: 3.2.2
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <devel.lists.libvirt.org>
Archived-At: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/message/BQTVMRJ4DJDRJO2JEK2MQ5NVL65DJUSO/>
List-Archive: 
 <https://lists.libvirt.org/archives/list/devel@lists.libvirt.org/>
List-Help: <mailto:devel-request@lists.libvirt.org?subject=help>
List-Post: <mailto:devel@lists.libvirt.org>
List-Subscribe: <mailto:devel-join@lists.libvirt.org>
List-Unsubscribe: <mailto:devel-leave@lists.libvirt.org>
X-ZohoMail-DKIM: fail (Header signature does not verify)
X-ZM-MESSAGEID: 1734528570704116600
Content-Type: text/plain; charset="utf-8"

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/cpu_map/x86_features.xml                                   | 3 +++
 tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml         | 2 +-
 tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml            | 1 +
 tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml             | 1 +
 tests/cputestdata/x86_64-cpuid-Cooperlake-disabled.xml         | 2 +-
 tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml            | 1 +
 tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml             | 1 +
 tests/cputestdata/x86_64-cpuid-Core-i5-4670T-disabled.xml      | 2 +-
 tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml         | 1 +
 tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml          | 1 +
 tests/cputestdata/x86_64-cpuid-Core-i5-6600-disabled.xml       | 2 +-
 tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml          | 1 +
 tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml           | 1 +
 tests/cputestdata/x86_64-cpuid-Core-i7-4510U-disabled.xml      | 1 +
 tests/cputestdata/x86_64-cpuid-Core-i7-4510U-guest.xml         | 1 +
 tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml          | 1 +
 tests/cputestdata/x86_64-cpuid-Core-i7-4600U-disabled.xml      | 1 +
 tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml         | 1 +
 tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml          | 1 +
 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-disabled.xml | 2 +-
 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml    | 1 +
 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml     | 1 +
 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-disabled.xml      | 2 +-
 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml         | 1 +
 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml          | 1 +
 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-disabled.xml | 2 +-
 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml    | 1 +
 tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml     | 1 +
 tests/cputestdata/x86_64-cpuid-Core-i7-7600U-disabled.xml      | 2 +-
 tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml         | 1 +
 tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml          | 1 +
 tests/cputestdata/x86_64-cpuid-Core-i7-7700-disabled.xml       | 2 +-
 tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml          | 1 +
 tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml           | 1 +
 tests/cputestdata/x86_64-cpuid-Core-i7-8550U-disabled.xml      | 2 +-
 tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml         | 1 +
 tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml          | 1 +
 tests/cputestdata/x86_64-cpuid-Core-i7-8700-disabled.xml       | 2 +-
 tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml          | 1 +
 tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml           | 1 +
 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-disabled.xml    | 2 +-
 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml       | 1 +
 tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-host.xml        | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml    | 2 +-
 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml       | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml        | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-disabled.xml    | 2 +-
 tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml       | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml        | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-disabled.xml    | 2 +-
 tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml       | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml        | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-disabled.xml    | 2 +-
 tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml       | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml        | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-disabled.xml    | 2 +-
 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-guest.xml       | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml        | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-disabled.xml    | 2 +-
 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml       | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml        | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-disabled.xml    | 2 +-
 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-guest.xml       | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml        | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-disabled.xml    | 2 +-
 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml       | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml        | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-disabled.xml    | 2 +-
 tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-guest.xml       | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml        | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-disabled.xml     | 2 +-
 tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml        | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml         | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml     | 2 +-
 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml        | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml         | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-disabled.xml     | 2 +-
 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml        | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml         | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-disabled.xml | 2 +-
 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml    | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml     | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-disabled.xml | 2 +-
 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml    | 1 +
 tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml     | 1 +
 85 files changed, 87 insertions(+), 26 deletions(-)

diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
index 34cf157780..4cbe094cfd 100644
--- a/src/cpu_map/x86_features.xml
+++ b/src/cpu_map/x86_features.xml
@@ -243,6 +243,9 @@
     <alias name=3D'cqm' source=3D'linux'/>
     <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x00001000'/>
   </feature>
+  <feature name=3D'zero-fcs-fds'>
+    <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x00002000'/>
+  </feature>
   <feature name=3D'mpx'>
     <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00000000' ebx=3D'0x00004000'/>
   </feature>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml b/tests=
/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml
index f6dd0ff97f..d073361965 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-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'0x080041dc' edx=3D'0xb0600000'/>
-  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02001040' ecx=3D'0x00000020' edx=3D'0x50000000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02003040' ecx=3D'0x00000020' edx=3D'0x50000000'/>
   <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'0x00000014' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00000000' ecx=3D'0x80000000' 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'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml b/tests/cp=
utestdata/x86_64-cpuid-Atom-P5362-guest.xml
index f5d5bb6cf6..0c8db656a1 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-guest.xml
@@ -20,6 +20,7 @@
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'fdp-excptn-only'/>
   <feature policy=3D'require' name=3D'cmt'/>
+  <feature policy=3D'require' name=3D'zero-fcs-fds'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
   <feature policy=3D'require' name=3D'waitpkg'/>
   <feature policy=3D'require' name=3D'rdpid'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml b/tests/cpu=
testdata/x86_64-cpuid-Atom-P5362-host.xml
index 74bd3642da..06f8fe5c08 100644
--- a/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Atom-P5362-host.xml
@@ -33,6 +33,7 @@
   <feature name=3D'smep'/>
   <feature name=3D'erms'/>
   <feature name=3D'cmt'/>
+  <feature name=3D'zero-fcs-fds'/>
   <feature name=3D'rdseed'/>
   <feature name=3D'smap'/>
   <feature name=3D'clflushopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-disabled.xml b/tests=
/cputestdata/x86_64-cpuid-Cooperlake-disabled.xml
index ad0f83dae9..fda549b34d 100644
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-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'0x0804c1dc' edx=3D'0xb0600000'/>
-  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02001040' ecx=3D'0x00000010' edx=3D'0x10000000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02003040' ecx=3D'0x00000010' edx=3D'0x10000000'/>
   <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-Cooperlake-guest.xml b/tests/cp=
utestdata/x86_64-cpuid-Cooperlake-guest.xml
index c1338ab1c1..70bffd1085 100644
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-guest.xml
@@ -21,6 +21,7 @@
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'fdp-excptn-only'/>
   <feature policy=3D'require' name=3D'cmt'/>
+  <feature policy=3D'require' name=3D'zero-fcs-fds'/>
   <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
   <feature policy=3D'require' name=3D'ospke'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml b/tests/cpu=
testdata/x86_64-cpuid-Cooperlake-host.xml
index bedb1400e7..4914b6bc36 100644
--- a/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Cooperlake-host.xml
@@ -23,6 +23,7 @@
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'fdp-excptn-only'/>
   <feature name=3D'cmt'/>
+  <feature name=3D'zero-fcs-fds'/>
   <feature name=3D'mpx'/>
   <feature name=3D'intel-pt'/>
   <feature name=3D'ospke'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-disabled.xml b/te=
sts/cputestdata/x86_64-cpuid-Core-i5-4670T-disabled.xml
index 0c6b68a57b..cd0257e8b5 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-disabled.xml
@@ -2,6 +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=
x00000810' ecx=3D'0x00000000' edx=3D'0x00000000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00002810' 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-i5-4670T-guest.xml b/tests=
/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
index e06bafe12a..b85d08980c 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-guest.xml
@@ -22,6 +22,7 @@
   <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
+  <feature policy=3D'require' name=3D'zero-fcs-fds'/>
   <feature policy=3D'require' name=3D'abm'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
   <feature policy=3D'require' name=3D'invtsc'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
index 7986162053..bba97d5c3e 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-4670T-host.xml
@@ -24,6 +24,7 @@
   <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
+  <feature name=3D'zero-fcs-fds'/>
   <feature name=3D'abm'/>
   <feature name=3D'pdpe1gb'/>
   <feature name=3D'invtsc'/>
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 040c0df183..8b88be91e0 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-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'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'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02002000' 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-i5-6600-guest.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
index 2f8cd224ac..e274688c27 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-guest.xml
@@ -18,6 +18,7 @@
   <feature policy=3D'require' name=3D'tm'/>
   <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
+  <feature policy=3D'require' name=3D'zero-fcs-fds'/>
   <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml b/tests/c=
putestdata/x86_64-cpuid-Core-i5-6600-host.xml
index c43d9f2a21..83b030a81f 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i5-6600-host.xml
@@ -20,6 +20,7 @@
   <feature name=3D'tm'/>
   <feature name=3D'pbe'/>
   <feature name=3D'tsc_adjust'/>
+  <feature name=3D'zero-fcs-fds'/>
   <feature name=3D'mpx'/>
   <feature name=3D'clflushopt'/>
   <feature name=3D'intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-disabled.xml b/te=
sts/cputestdata/x86_64-cpuid-Core-i7-4510U-disabled.xml
index dbc978e734..6ff4ce17ee 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-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'0x0800c19c' edx=3D'0xb0600000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00002000' 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-4510U-guest.xml b/tests=
/cputestdata/x86_64-cpuid-Core-i7-4510U-guest.xml
index 618b266e41..5ff5b479dd 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-guest.xml
@@ -21,6 +21,7 @@
   <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
+  <feature policy=3D'require' name=3D'zero-fcs-fds'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'abm'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml
index 43e0257a3f..d25f3d7d01 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4510U-host.xml
@@ -37,6 +37,7 @@
   <feature name=3D'bmi2'/>
   <feature name=3D'erms'/>
   <feature name=3D'invpcid'/>
+  <feature name=3D'zero-fcs-fds'/>
   <feature name=3D'xsaveopt'/>
   <feature name=3D'abm'/>
   <feature name=3D'pdpe1gb'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-disabled.xml b/te=
sts/cputestdata/x86_64-cpuid-Core-i7-4600U-disabled.xml
index 4a0477f788..71cdda84f5 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-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=
x00002000' 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-4600U-guest.xml b/tests=
/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
index a5cf3a8ebb..000bcf19ee 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-guest.xml
@@ -22,6 +22,7 @@
   <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
+  <feature policy=3D'require' name=3D'zero-fcs-fds'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'abm'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
index 41545483f2..feaaeffbcf 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-4600U-host.xml
@@ -24,6 +24,7 @@
   <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
+  <feature name=3D'zero-fcs-fds'/>
   <feature name=3D'xsaveopt'/>
   <feature name=3D'abm'/>
   <feature name=3D'pdpe1gb'/>
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 edce01618a..749038d9c1 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,6 +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'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02002000' 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-guest.xml b/=
tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml
index da6e4f8a9b..557964fcdc 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-guest.xml
@@ -22,6 +22,7 @@
   <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
+  <feature policy=3D'require' name=3D'zero-fcs-fds'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'abm'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml b/t=
ests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml
index 872b531c0f..6b55c46844 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-arat-host.xml
@@ -24,6 +24,7 @@
   <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
+  <feature name=3D'zero-fcs-fds'/>
   <feature name=3D'intel-pt'/>
   <feature name=3D'xsaveopt'/>
   <feature name=3D'abm'/>
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 fa9571c29d..49ff47eb49 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-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=
x02000000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02002000' 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-guest.xml b/tests=
/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
index da6e4f8a9b..557964fcdc 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-guest.xml
@@ -22,6 +22,7 @@
   <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
+  <feature policy=3D'require' name=3D'zero-fcs-fds'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'abm'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
index 872b531c0f..6b55c46844 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-host.xml
@@ -24,6 +24,7 @@
   <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
+  <feature name=3D'zero-fcs-fds'/>
   <feature name=3D'intel-pt'/>
   <feature name=3D'xsaveopt'/>
   <feature name=3D'abm'/>
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 91ae45d24b..f1b1f08eda 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=
x02000000' ecx=3D'0x00000000' edx=3D'0x0c000000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02002000' 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-5600U-ibrs-guest.xml b/=
tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml
index 2fe2645ee3..881f95b348 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-guest.xml
@@ -22,6 +22,7 @@
   <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
+  <feature policy=3D'require' name=3D'zero-fcs-fds'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
   <feature policy=3D'require' name=3D'stibp'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml b/t=
ests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
index d99718d9f7..ce0913f368 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-5600U-ibrs-host.xml
@@ -24,6 +24,7 @@
   <feature name=3D'pbe'/>
   <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
+  <feature name=3D'zero-fcs-fds'/>
   <feature name=3D'intel-pt'/>
   <feature name=3D'stibp'/>
   <feature name=3D'xsaveopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-disabled.xml b/te=
sts/cputestdata/x86_64-cpuid-Core-i7-7600U-disabled.xml
index 7eece82aff..64a7e2dfdf 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-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=
x02000004' ecx=3D'0x00000000' edx=3D'0x18000000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02002004' ecx=3D'0x00000000' edx=3D'0x18000000'/>
   <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-7600U-guest.xml b/tests=
/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml
index 2fa57c5341..c4ec3a8721 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-guest.xml
@@ -19,6 +19,7 @@
   <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'sgx'/>
+  <feature policy=3D'require' name=3D'zero-fcs-fds'/>
   <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
index 1234266ede..4df35fc0f5 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7600U-host.xml
@@ -21,6 +21,7 @@
   <feature name=3D'pbe'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'sgx'/>
+  <feature name=3D'zero-fcs-fds'/>
   <feature name=3D'mpx'/>
   <feature name=3D'clflushopt'/>
   <feature name=3D'intel-pt'/>
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 9e83f4c534..a71df50220 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-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'0x0800c1fc' edx=3D'0xb0600000'/>
-  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02000004' ecx=3D'0x00000000' edx=3D'0x00000000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02002004' 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-Core-i7-7700-guest.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml
index c19c773446..20856638cf 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-guest.xml
@@ -19,6 +19,7 @@
   <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'sgx'/>
+  <feature policy=3D'require' name=3D'zero-fcs-fds'/>
   <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml b/tests/c=
putestdata/x86_64-cpuid-Core-i7-7700-host.xml
index 0343a80dba..f8501270d8 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-7700-host.xml
@@ -21,6 +21,7 @@
   <feature name=3D'pbe'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'sgx'/>
+  <feature name=3D'zero-fcs-fds'/>
   <feature name=3D'mpx'/>
   <feature name=3D'clflushopt'/>
   <feature name=3D'intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-disabled.xml b/te=
sts/cputestdata/x86_64-cpuid-Core-i7-8550U-disabled.xml
index b6daaf2e50..20c86d2b3b 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-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'0x0800c19c' edx=3D'0xb0600000'/>
-  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02000004' ecx=3D'0x00000000' edx=3D'0x10000000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02002004' ecx=3D'0x00000000' edx=3D'0x10000000'/>
   <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-8550U-guest.xml b/tests=
/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
index 9ee8103b22..7bd3c5a927 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
@@ -18,6 +18,7 @@
   <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'sgx'/>
+  <feature policy=3D'require' name=3D'zero-fcs-fds'/>
   <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
index c13f60d6fd..8939f42894 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
@@ -20,6 +20,7 @@
   <feature name=3D'pbe'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'sgx'/>
+  <feature name=3D'zero-fcs-fds'/>
   <feature name=3D'mpx'/>
   <feature name=3D'clflushopt'/>
   <feature name=3D'intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-disabled.xml b/tes=
ts/cputestdata/x86_64-cpuid-Core-i7-8700-disabled.xml
index fd9b8435ab..e470f88ee2 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-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'0x0800c1fc' edx=3D'0xb0600000'/>
-  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02000004' ecx=3D'0x40000000' edx=3D'0x18000000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02002004' ecx=3D'0x40000000' edx=3D'0x18000000'/>
   <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-8700-guest.xml b/tests/=
cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
index cacd587f13..7bba076fdc 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-guest.xml
@@ -19,6 +19,7 @@
   <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'sgx'/>
+  <feature policy=3D'require' name=3D'zero-fcs-fds'/>
   <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml b/tests/c=
putestdata/x86_64-cpuid-Core-i7-8700-host.xml
index 59115d36ae..0ce69ffcde 100644
--- a/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8700-host.xml
@@ -21,6 +21,7 @@
   <feature name=3D'pbe'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'sgx'/>
+  <feature name=3D'zero-fcs-fds'/>
   <feature name=3D'mpx'/>
   <feature name=3D'clflushopt'/>
   <feature name=3D'intel-pt'/>
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 45e8183cb8..5a44c56da5 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=
x02001044' ecx=3D'0x40400010' edx=3D'0x10000010'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02003044' ecx=3D'0x40400010' edx=3D'0x10000010'/>
   <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 5d5ed161fa..6ab30dcd2b 100644
--- a/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Ice-Lake-Server-guest.xml
@@ -22,6 +22,7 @@
   <feature policy=3D'require' name=3D'sgx'/>
   <feature policy=3D'require' name=3D'fdp-excptn-only'/>
   <feature policy=3D'require' name=3D'cmt'/>
+  <feature policy=3D'require' name=3D'zero-fcs-fds'/>
   <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'avx512ifma'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
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 4c792e62f4..37157cbc2d 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'sgx'/>
   <feature name=3D'fdp-excptn-only'/>
   <feature name=3D'cmt'/>
+  <feature name=3D'zero-fcs-fds'/>
   <feature name=3D'mpx'/>
   <feature name=3D'avx512ifma'/>
   <feature name=3D'intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml b/=
tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml
index fb9a4988ad..28dd2acdef 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-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'0x0800c1fc' edx=3D'0xb0600000'/>
-  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02000004' ecx=3D'0x00000000' edx=3D'0x10000000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02002004' ecx=3D'0x00000000' edx=3D'0x10000000'/>
   <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-Xeon-E3-1225-v5-guest.xml b/tes=
ts/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
index 628ac411fb..0e2efdcf5c 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-guest.xml
@@ -19,6 +19,7 @@
   <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'sgx'/>
+  <feature policy=3D'require' name=3D'zero-fcs-fds'/>
   <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
index 131674e449..f2a1f9cdfd 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1225-v5-host.xml
@@ -21,6 +21,7 @@
   <feature name=3D'pbe'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'sgx'/>
+  <feature name=3D'zero-fcs-fds'/>
   <feature name=3D'mpx'/>
   <feature name=3D'clflushopt'/>
   <feature name=3D'intel-pt'/>
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 536354e641..275a7b5632 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,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=
x02000004' ecx=3D'0x00000000' edx=3D'0x00000000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02002004' 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-E3-1245-v5-guest.xml b/tes=
ts/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml
index c19c773446..20856638cf 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-guest.xml
@@ -19,6 +19,7 @@
   <feature policy=3D'require' name=3D'pbe'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'sgx'/>
+  <feature policy=3D'require' name=3D'zero-fcs-fds'/>
   <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
index b3fb527dac..4eb3739792 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E3-1245-v5-host.xml
@@ -21,6 +21,7 @@
   <feature name=3D'pbe'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'sgx'/>
+  <feature name=3D'zero-fcs-fds'/>
   <feature name=3D'mpx'/>
   <feature name=3D'clflushopt'/>
   <feature name=3D'intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-disabled.xml b/=
tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-disabled.xml
index ec299652f7..0a112caec3 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-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'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=
x00003000' ecx=3D'0x00000000' 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'/>
 </cpudata>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml b/tes=
ts/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml
index 9f7b0376b5..b7b397d70f 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-guest.xml
@@ -24,6 +24,7 @@
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
+  <feature policy=3D'require' name=3D'zero-fcs-fds'/>
   <feature policy=3D'require' name=3D'stibp'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'abm'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml
index 9e57e13c7d..bb0f1b033e 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2609-v3-host.xml
@@ -26,6 +26,7 @@
   <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
+  <feature name=3D'zero-fcs-fds'/>
   <feature name=3D'stibp'/>
   <feature name=3D'xsaveopt'/>
   <feature name=3D'abm'/>
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 40ee740aa8..a930f0b537 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=
x02001000' ecx=3D'0x00000000' edx=3D'0x08000000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02003000' 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-2623-v4-guest.xml b/tes=
ts/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
index 49ed41e473..7b64b49d60 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-guest.xml
@@ -24,6 +24,7 @@
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
+  <feature policy=3D'require' name=3D'zero-fcs-fds'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
   <feature policy=3D'require' name=3D'stibp'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
index 6280bf46cc..5929b7a73a 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2623-v4-host.xml
@@ -26,6 +26,7 @@
   <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
+  <feature name=3D'zero-fcs-fds'/>
   <feature name=3D'intel-pt'/>
   <feature name=3D'stibp'/>
   <feature name=3D'xsaveopt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-disabled.xml b/=
tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-disabled.xml
index e6f4ce761d..b38e7b1449 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-disabled.xml
@@ -2,6 +2,6 @@
 <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'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=
x00001000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00003000' 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-2630-v3-guest.xml b/tes=
ts/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-guest.xml
index 833b859048..e9d7c483d1 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-guest.xml
@@ -24,6 +24,7 @@
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
+  <feature policy=3D'require' name=3D'zero-fcs-fds'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'abm'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml
index 44a435e71c..9ccab8b3c7 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v3-host.xml
@@ -26,6 +26,7 @@
   <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
+  <feature name=3D'zero-fcs-fds'/>
   <feature name=3D'xsaveopt'/>
   <feature name=3D'abm'/>
   <feature name=3D'pdpe1gb'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-disabled.xml b/=
tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-disabled.xml
index 3ffb246167..697c33bd85 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-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=
x02001000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02003000' 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-E5-2630-v4-guest.xml b/tes=
ts/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
index 2cd4308710..dd1b79c666 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-guest.xml
@@ -24,6 +24,7 @@
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
+  <feature policy=3D'require' name=3D'zero-fcs-fds'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'mbm_total'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
index 7b3c52f39a..00e22a597b 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2630-v4-host.xml
@@ -26,6 +26,7 @@
   <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
+  <feature name=3D'zero-fcs-fds'/>
   <feature name=3D'intel-pt'/>
   <feature name=3D'xsaveopt'/>
   <feature name=3D'mbm_total'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-disabled.xml b/=
tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-disabled.xml
index 9e25e6a94d..2520970420 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-disabled.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'0x0804c1dc' 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=
x00001002' ecx=3D'0x00000000' edx=3D'0x00000000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x00003002' ecx=3D'0x00000000' edx=3D'0x00000000'/>
   <cpuid eax_in=3D'0x0000000d' ecx_in=3D'0x01' eax=3D'0x00000001' 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-Xeon-E5-2650-v3-guest.xml b/tes=
ts/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-guest.xml
index 833b859048..e9d7c483d1 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-guest.xml
@@ -24,6 +24,7 @@
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
+  <feature policy=3D'require' name=3D'zero-fcs-fds'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'abm'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml
index 44a435e71c..9ccab8b3c7 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v3-host.xml
@@ -26,6 +26,7 @@
   <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
+  <feature name=3D'zero-fcs-fds'/>
   <feature name=3D'xsaveopt'/>
   <feature name=3D'abm'/>
   <feature name=3D'pdpe1gb'/>
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 3ffb246167..697c33bd85 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=
x02001000' ecx=3D'0x00000000' edx=3D'0x00000000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02003000' 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-E5-2650-v4-guest.xml b/tes=
ts/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
index 2cd4308710..dd1b79c666 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-guest.xml
@@ -24,6 +24,7 @@
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
+  <feature policy=3D'require' name=3D'zero-fcs-fds'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'mbm_total'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml
index 7b3c52f39a..00e22a597b 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E5-2650-v4-host.xml
@@ -26,6 +26,7 @@
   <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
+  <feature name=3D'zero-fcs-fds'/>
   <feature name=3D'intel-pt'/>
   <feature name=3D'xsaveopt'/>
   <feature name=3D'mbm_total'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-disabled.xml b/=
tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-disabled.xml
index aacc7a2b14..8443d705c9 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-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'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=
x00003000' 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-E7-8890-v3-guest.xml b/tes=
ts/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-guest.xml
index dc91fceaef..dfa07507cf 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-guest.xml
@@ -24,6 +24,7 @@
   <feature policy=3D'require' name=3D'arat'/>
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'cmt'/>
+  <feature policy=3D'require' name=3D'zero-fcs-fds'/>
   <feature policy=3D'require' name=3D'xsaveopt'/>
   <feature policy=3D'require' name=3D'abm'/>
   <feature policy=3D'require' name=3D'pdpe1gb'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml
index f5a846da27..84d1a948e8 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-E7-8890-v3-host.xml
@@ -26,6 +26,7 @@
   <feature name=3D'arat'/>
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'cmt'/>
+  <feature name=3D'zero-fcs-fds'/>
   <feature name=3D'xsaveopt'/>
   <feature name=3D'abm'/>
   <feature name=3D'pdpe1gb'/>
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 8971cc2bad..d47889c6a8 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=
x02001040' ecx=3D'0x00000008' edx=3D'0x08000000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02003040' 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-5115-guest.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
index 84384fda81..1a648331ce 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-guest.xml
@@ -21,6 +21,7 @@
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'fdp-excptn-only'/>
   <feature policy=3D'require' name=3D'cmt'/>
+  <feature policy=3D'require' name=3D'zero-fcs-fds'/>
   <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml b/tests=
/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
index 4af85f2887..ae04f54c40 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-5115-host.xml
@@ -23,6 +23,7 @@
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'fdp-excptn-only'/>
   <feature name=3D'cmt'/>
+  <feature name=3D'zero-fcs-fds'/>
   <feature name=3D'mpx'/>
   <feature name=3D'clflushopt'/>
   <feature name=3D'intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml b/t=
ests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml
index ad0f83dae9..fda549b34d 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-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'0x0804c1dc' edx=3D'0xb0600000'/>
-  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02001040' ecx=3D'0x00000010' edx=3D'0x10000000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02003040' ecx=3D'0x00000010' edx=3D'0x10000000'/>
   <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-6130-guest.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
index 6430b8532c..89b86b3391 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-guest.xml
@@ -21,6 +21,7 @@
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'fdp-excptn-only'/>
   <feature policy=3D'require' name=3D'cmt'/>
+  <feature policy=3D'require' name=3D'zero-fcs-fds'/>
   <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml b/tests=
/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
index 96b813f47a..b94eb3eb2a 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6130-host.xml
@@ -23,6 +23,7 @@
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'fdp-excptn-only'/>
   <feature name=3D'cmt'/>
+  <feature name=3D'zero-fcs-fds'/>
   <feature name=3D'mpx'/>
   <feature name=3D'clflushopt'/>
   <feature name=3D'intel-pt'/>
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 926d15b522..4968a66c2f 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=
x02001040' ecx=3D'0x00000008' edx=3D'0x00000000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02003040' 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-Gold-6148-guest.xml b/test=
s/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
index 45e58dc5e2..549462f1a3 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-guest.xml
@@ -21,6 +21,7 @@
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'fdp-excptn-only'/>
   <feature policy=3D'require' name=3D'cmt'/>
+  <feature policy=3D'require' name=3D'zero-fcs-fds'/>
   <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'clflushopt'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml b/tests=
/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
index 18661472a2..34510d9396 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Gold-6148-host.xml
@@ -23,6 +23,7 @@
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'fdp-excptn-only'/>
   <feature name=3D'cmt'/>
+  <feature name=3D'zero-fcs-fds'/>
   <feature name=3D'mpx'/>
   <feature name=3D'clflushopt'/>
   <feature name=3D'intel-pt'/>
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 b263130580..19aa8272c4 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,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=
x02001040' ecx=3D'0x00000010' edx=3D'0x38000400'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02003040' ecx=3D'0x00000010' edx=3D'0x38000400'/>
   <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'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml b/=
tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
index 2660200972..51543732d8 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-guest.xml
@@ -21,6 +21,7 @@
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'fdp-excptn-only'/>
   <feature policy=3D'require' name=3D'cmt'/>
+  <feature policy=3D'require' name=3D'zero-fcs-fds'/>
   <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
   <feature policy=3D'require' name=3D'pku'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml b/t=
ests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
index 298f8d7629..2652c787d0 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-8268-host.xml
@@ -23,6 +23,7 @@
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'fdp-excptn-only'/>
   <feature name=3D'cmt'/>
+  <feature name=3D'zero-fcs-fds'/>
   <feature name=3D'mpx'/>
   <feature name=3D'intel-pt'/>
   <feature name=3D'pku'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-disabled.xml=
 b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-disabled.xml
index ad0f83dae9..fda549b34d 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-disabled.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-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'0x0804c1dc' edx=3D'0xb0600000'/>
-  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02001040' ecx=3D'0x00000010' edx=3D'0x10000000'/>
+  <cpuid eax_in=3D'0x00000007' ecx_in=3D'0x00' eax=3D'0x00000000' ebx=3D'0=
x02003040' ecx=3D'0x00000010' edx=3D'0x10000000'/>
   <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-Platinum-9242-guest.xml b/=
tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml
index f7faf1f7d4..1bee8605fb 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-guest.xml
@@ -21,6 +21,7 @@
   <feature policy=3D'require' name=3D'tsc_adjust'/>
   <feature policy=3D'require' name=3D'fdp-excptn-only'/>
   <feature policy=3D'require' name=3D'cmt'/>
+  <feature policy=3D'require' name=3D'zero-fcs-fds'/>
   <feature policy=3D'require' name=3D'mpx'/>
   <feature policy=3D'require' name=3D'intel-pt'/>
   <feature policy=3D'require' name=3D'pku'/>
diff --git a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml b/t=
ests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
index 6c36f9c9f9..911458402e 100644
--- a/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
+++ b/tests/cputestdata/x86_64-cpuid-Xeon-Platinum-9242-host.xml
@@ -23,6 +23,7 @@
   <feature name=3D'tsc_adjust'/>
   <feature name=3D'fdp-excptn-only'/>
   <feature name=3D'cmt'/>
+  <feature name=3D'zero-fcs-fds'/>
   <feature name=3D'mpx'/>
   <feature name=3D'intel-pt'/>
   <feature name=3D'pku'/>
--=20
2.47.1