From nobody Wed Dec  4 18:32:11 2024
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 173204424488079.09657826810417;
 Tue, 19 Nov 2024 11:24:04 -0800 (PST)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id 97CF4171D; Tue, 19 Nov 2024 14:24:03 -0500 (EST)
Received: from lists.libvirt.org (localhost [IPv6:::1])
	by lists.libvirt.org (Postfix) with ESMTP id E48C814FE;
	Tue, 19 Nov 2024 13:52:14 -0500 (EST)
Received: by lists.libvirt.org (Postfix, from userid 996)
	id 183C715F2; Tue, 19 Nov 2024 13:52:06 -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 D64261434
	for <devel@lists.libvirt.org>; Tue, 19 Nov 2024 13:51:16 -0500 (EST)
Received: from mx-prod-mc-03.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-7-AMdOP9LiMbu8bH1XqHgTzg-1; Tue,
 19 Nov 2024 13:51:14 -0500
Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com
 (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12])
	(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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS
 id 204431955F2B
	for <devel@lists.libvirt.org>; Tue, 19 Nov 2024 18:51:14 +0000 (UTC)
Received: from orkuz (unknown [10.45.226.13])
	by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP
 id 97CB119560A3
	for <devel@lists.libvirt.org>; Tue, 19 Nov 2024 18:51:13 +0000 (UTC)
X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org
X-Spam-Level: 
X-Spam-Status: No, score=-0.5 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=1732042276;
	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=ujcRJqEKz5Inp6vzm0JUcw4djN7aI0kg2mfkIF3Irbc=;
	b=cARDkztPpqEj6I6ToYXnfUtG2CWV2Qn4x+SM5qxtrthjs79SBpdsLzBe/kZxipHzV3Gyr0
	lYE9pXZA7O7M6FzsqRACt80f9OhIfOaYLSzuFgC5pL/wpW0aT58x5PF5sSDSq3D8DRH22K
	2UX6GOZaYCo9lQDESi2puc1UXI6vDck=
X-MC-Unique: AMdOP9LiMbu8bH1XqHgTzg-1
X-Mimecast-MFC-AGG-ID: AMdOP9LiMbu8bH1XqHgTzg
From: Jiri Denemark <jdenemar@redhat.com>
To: devel@lists.libvirt.org
Subject: [PATCH 27/32] cpu_map: Add versions of Westmere CPU model
Date: Tue, 19 Nov 2024 19:50:03 +0100
Message-ID: 
 <7dfd6de924732b31ab3bf80c5230f214f6450a8c.1732039836.git.jdenemar@redhat.com>
In-Reply-To: <cover.1732039836.git.jdenemar@redhat.com>
References: <cover.1732039836.git.jdenemar@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12
X-Mimecast-Spam-Score: 0
X-Mimecast-MFC-PROC-ID: FtIbdmm2njOzB47HcPT3Tg8G3xiHVKhun7fuXH73crE_1732042274
X-Mimecast-Originator: redhat.com
Content-Transfer-Encoding: quoted-printable
Message-ID-Hash: V2R4PKQEU6KL73SRHDPKWASINH4G3TF6
X-Message-ID-Hash: V2R4PKQEU6KL73SRHDPKWASINH4G3TF6
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/V2R4PKQEU6KL73SRHDPKWASINH4G3TF6/>
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: 1732044245735116600
Content-Type: text/plain; charset="utf-8"

Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
---
 src/cpu_map/index.xml                         |   2 +
 src/cpu_map/meson.build                       |   2 +
 src/cpu_map/x86_Westmere-v1.xml               |   6 +
 src/cpu_map/x86_Westmere-v2.xml               | 105 ++++++++++++++++++
 .../domaincapsdata/qemu_5.2.0-q35.x86_64.xml  |   5 +
 .../domaincapsdata/qemu_5.2.0-tcg.x86_64.xml  |   5 +
 tests/domaincapsdata/qemu_5.2.0.x86_64.xml    |   5 +
 .../domaincapsdata/qemu_6.0.0-q35.x86_64.xml  |   5 +
 .../domaincapsdata/qemu_6.0.0-tcg.x86_64.xml  |   5 +
 tests/domaincapsdata/qemu_6.0.0.x86_64.xml    |   5 +
 .../domaincapsdata/qemu_6.1.0-q35.x86_64.xml  |   5 +
 .../domaincapsdata/qemu_6.1.0-tcg.x86_64.xml  |   5 +
 tests/domaincapsdata/qemu_6.1.0.x86_64.xml    |   5 +
 .../domaincapsdata/qemu_6.2.0-q35.x86_64.xml  |   5 +
 .../domaincapsdata/qemu_6.2.0-tcg.x86_64.xml  |   5 +
 tests/domaincapsdata/qemu_6.2.0.x86_64.xml    |   5 +
 .../domaincapsdata/qemu_7.0.0-q35.x86_64.xml  |   5 +
 .../domaincapsdata/qemu_7.0.0-tcg.x86_64.xml  |   5 +
 tests/domaincapsdata/qemu_7.0.0.x86_64.xml    |   5 +
 .../domaincapsdata/qemu_7.1.0-q35.x86_64.xml  |   5 +
 .../domaincapsdata/qemu_7.1.0-tcg.x86_64.xml  |   5 +
 tests/domaincapsdata/qemu_7.1.0.x86_64.xml    |   5 +
 .../domaincapsdata/qemu_7.2.0-q35.x86_64.xml  |   5 +
 .../qemu_7.2.0-tcg.x86_64+hvf.xml             |   5 +
 .../domaincapsdata/qemu_7.2.0-tcg.x86_64.xml  |   5 +
 tests/domaincapsdata/qemu_7.2.0.x86_64.xml    |   5 +
 .../domaincapsdata/qemu_8.0.0-q35.x86_64.xml  |   5 +
 .../domaincapsdata/qemu_8.0.0-tcg.x86_64.xml  |   5 +
 tests/domaincapsdata/qemu_8.0.0.x86_64.xml    |   5 +
 .../domaincapsdata/qemu_8.1.0-q35.x86_64.xml  |   5 +
 .../domaincapsdata/qemu_8.1.0-tcg.x86_64.xml  |   5 +
 tests/domaincapsdata/qemu_8.1.0.x86_64.xml    |   5 +
 .../domaincapsdata/qemu_8.2.0-q35.x86_64.xml  |   5 +
 .../domaincapsdata/qemu_8.2.0-tcg.x86_64.xml  |   5 +
 tests/domaincapsdata/qemu_8.2.0.x86_64.xml    |   5 +
 .../domaincapsdata/qemu_9.0.0-q35.x86_64.xml  |   5 +
 .../domaincapsdata/qemu_9.0.0-tcg.x86_64.xml  |   5 +
 tests/domaincapsdata/qemu_9.0.0.x86_64.xml    |   5 +
 .../domaincapsdata/qemu_9.1.0-q35.x86_64.xml  |   5 +
 .../domaincapsdata/qemu_9.1.0-tcg.x86_64.xml  |   5 +
 tests/domaincapsdata/qemu_9.1.0.x86_64.xml    |   5 +
 .../domaincapsdata/qemu_9.2.0-q35.x86_64.xml  |   5 +
 .../domaincapsdata/qemu_9.2.0-tcg.x86_64.xml  |   5 +
 tests/domaincapsdata/qemu_9.2.0.x86_64.xml    |   5 +
 44 files changed, 315 insertions(+)
 create mode 100644 src/cpu_map/x86_Westmere-v1.xml
 create mode 100644 src/cpu_map/x86_Westmere-v2.xml

diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
index bc9db47c89..7900e6d824 100644
--- a/src/cpu_map/index.xml
+++ b/src/cpu_map/index.xml
@@ -33,6 +33,8 @@
       <include filename=3D'x86_Nehalem-IBRS.xml'/>
       <include filename=3D'x86_Westmere.xml'/>
       <include filename=3D'x86_Westmere-IBRS.xml'/>
+      <include filename=3D'x86_Westmere-v1.xml'/>
+      <include filename=3D'x86_Westmere-v2.xml'/>
       <include filename=3D'x86_SandyBridge.xml'/>
       <include filename=3D'x86_SandyBridge-IBRS.xml'/>
       <include filename=3D'x86_SandyBridge-v1.xml'/>
diff --git a/src/cpu_map/meson.build b/src/cpu_map/meson.build
index de1eb8efbd..474f43fad5 100644
--- a/src/cpu_map/meson.build
+++ b/src/cpu_map/meson.build
@@ -129,6 +129,8 @@ cpumap_data =3D [
   'x86_Snowridge.xml',
   'x86_vendors.xml',
   'x86_Westmere-IBRS.xml',
+  'x86_Westmere-v1.xml',
+  'x86_Westmere-v2.xml',
   'x86_Westmere.xml',
 ]
=20
diff --git a/src/cpu_map/x86_Westmere-v1.xml b/src/cpu_map/x86_Westmere-v1.=
xml
new file mode 100644
index 0000000000..723a1d0242
--- /dev/null
+++ b/src/cpu_map/x86_Westmere-v1.xml
@@ -0,0 +1,6 @@
+<cpus>
+  <model name=3D'Westmere-v1'>
+    <decode host=3D'off' guest=3D'off'/>
+    <model name=3D'Westmere'/>
+  </model>
+</cpus>
diff --git a/src/cpu_map/x86_Westmere-v2.xml b/src/cpu_map/x86_Westmere-v2.=
xml
new file mode 100644
index 0000000000..07c52ff6df
--- /dev/null
+++ b/src/cpu_map/x86_Westmere-v2.xml
@@ -0,0 +1,105 @@
+<cpus>
+  <model name=3D'Westmere-v2'>
+    <decode host=3D'on' guest=3D'on'/>
+    <signature family=3D'6' model=3D'44'/>
+    <signature family=3D'6' model=3D'47'/>
+    <signature family=3D'6' model=3D'37'/>
+    <vendor name=3D'Intel'/>
+    <feature name=3D'aes'/>
+    <feature name=3D'apic'/>
+    <feature name=3D'arat'/>
+    <feature name=3D'clflush'/>
+    <feature name=3D'cmov'/>
+    <feature name=3D'cx16'/>
+    <feature name=3D'cx8'/>
+    <feature name=3D'de'/>
+    <feature name=3D'fpu'/>
+    <feature name=3D'fxsr'/>
+    <feature name=3D'lahf_lm'/>
+    <feature name=3D'lm'/>
+    <feature name=3D'mca'/>
+    <feature name=3D'mce'/>
+    <feature name=3D'mmx'/>
+    <feature name=3D'msr'/>
+    <feature name=3D'mtrr'/>
+    <feature name=3D'nx'/>
+    <feature name=3D'pae'/>
+    <feature name=3D'pat'/>
+    <feature name=3D'pclmuldq'/>
+    <feature name=3D'pge'/>
+    <feature name=3D'pni'/>
+    <feature name=3D'popcnt'/>
+    <feature name=3D'pse'/>
+    <feature name=3D'pse36'/>
+    <feature name=3D'sep'/>
+    <feature name=3D'spec-ctrl'/>
+    <feature name=3D'sse'/>
+    <feature name=3D'sse2'/>
+    <feature name=3D'sse4.1'/>
+    <feature name=3D'sse4.2'/>
+    <feature name=3D'ssse3'/>
+    <feature name=3D'syscall'/>
+    <feature name=3D'tsc'/>
+    <feature name=3D'vme'/>
+    <feature name=3D'vmx-activity-hlt'/>
+    <feature name=3D'vmx-apicv-x2apic'/>
+    <feature name=3D'vmx-apicv-xapic'/>
+    <feature name=3D'vmx-cr3-load-noexit'/>
+    <feature name=3D'vmx-cr3-store-noexit'/>
+    <feature name=3D'vmx-cr8-load-exit'/>
+    <feature name=3D'vmx-cr8-store-exit'/>
+    <feature name=3D'vmx-desc-exit'/>
+    <feature name=3D'vmx-entry-ia32e-mode'/>
+    <feature name=3D'vmx-entry-load-efer'/>
+    <feature name=3D'vmx-entry-load-pat'/>
+    <feature name=3D'vmx-entry-load-perf-global-ctrl'/>
+    <feature name=3D'vmx-entry-noload-debugctl'/>
+    <feature name=3D'vmx-ept'/>
+    <feature name=3D'vmx-ept-1gb'/>
+    <feature name=3D'vmx-ept-2mb'/>
+    <feature name=3D'vmx-ept-execonly'/>
+    <feature name=3D'vmx-exit-ack-intr'/>
+    <feature name=3D'vmx-exit-load-efer'/>
+    <feature name=3D'vmx-exit-load-pat'/>
+    <feature name=3D'vmx-exit-load-perf-global-ctrl'/>
+    <feature name=3D'vmx-exit-nosave-debugctl'/>
+    <feature name=3D'vmx-exit-save-efer'/>
+    <feature name=3D'vmx-exit-save-pat'/>
+    <feature name=3D'vmx-exit-save-preemption-timer'/>
+    <feature name=3D'vmx-flexpriority'/>
+    <feature name=3D'vmx-hlt-exit'/>
+    <feature name=3D'vmx-ins-outs'/>
+    <feature name=3D'vmx-intr-exit'/>
+    <feature name=3D'vmx-invept'/>
+    <feature name=3D'vmx-invept-all-context'/>
+    <feature name=3D'vmx-invept-single-context'/>
+    <feature name=3D'vmx-invlpg-exit'/>
+    <feature name=3D'vmx-invvpid-all-context'/>
+    <feature name=3D'vmx-invvpid-single-addr'/>
+    <feature name=3D'vmx-invvpid-single-context-noglobals'/>
+    <feature name=3D'vmx-io-bitmap'/>
+    <feature name=3D'vmx-io-exit'/>
+    <feature name=3D'vmx-monitor-exit'/>
+    <feature name=3D'vmx-movdr-exit'/>
+    <feature name=3D'vmx-msr-bitmap'/>
+    <feature name=3D'vmx-mtf'/>
+    <feature name=3D'vmx-mwait-exit'/>
+    <feature name=3D'vmx-nmi-exit'/>
+    <feature name=3D'vmx-page-walk-4'/>
+    <feature name=3D'vmx-pause-exit'/>
+    <feature name=3D'vmx-preemption-timer'/>
+    <feature name=3D'vmx-rdpmc-exit'/>
+    <feature name=3D'vmx-rdtsc-exit'/>
+    <feature name=3D'vmx-rdtscp-exit'/>
+    <feature name=3D'vmx-secondary-ctls'/>
+    <feature name=3D'vmx-store-lma'/>
+    <feature name=3D'vmx-true-ctls'/>
+    <feature name=3D'vmx-tsc-offset'/>
+    <feature name=3D'vmx-unrestricted-guest'/>
+    <feature name=3D'vmx-vintr-pending'/>
+    <feature name=3D'vmx-vnmi'/>
+    <feature name=3D'vmx-vnmi-pending'/>
+    <feature name=3D'vmx-vpid'/>
+    <feature name=3D'vmx-wbinvd-exit'/>
+  </model>
+</cpus>
diff --git a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml b/tests/domainc=
apsdata/qemu_5.2.0-q35.x86_64.xml
index 605aa866e1..6932895110 100644
--- a/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-q35.x86_64.xml
@@ -729,6 +729,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'no' vendor=3D'AMD'>athlon</model>
       <blockers model=3D'athlon'>
         <feature name=3D'3dnow'/>
diff --git a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_5.2.0-tcg.x86_64.xml
index 01af090ce9..d4a5b2c3b8 100644
--- a/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0-tcg.x86_64.xml
@@ -1245,6 +1245,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'yes' vendor=3D'AMD'>athlon</model>
       <model usable=3D'yes' vendor=3D'Intel'>core2duo</model>
       <model usable=3D'yes' vendor=3D'Intel'>coreduo</model>
diff --git a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml b/tests/domaincapsd=
ata/qemu_5.2.0.x86_64.xml
index 243cbfe504..980c940883 100644
--- a/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_5.2.0.x86_64.xml
@@ -728,6 +728,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'no' vendor=3D'AMD'>athlon</model>
       <blockers model=3D'athlon'>
         <feature name=3D'3dnow'/>
diff --git a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml b/tests/domainc=
apsdata/qemu_6.0.0-q35.x86_64.xml
index f33fffe78b..cfa1740854 100644
--- a/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-q35.x86_64.xml
@@ -738,6 +738,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'no' vendor=3D'AMD'>athlon</model>
       <blockers model=3D'athlon'>
         <feature name=3D'3dnow'/>
diff --git a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_6.0.0-tcg.x86_64.xml
index b7d51223ab..f409f19159 100644
--- a/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0-tcg.x86_64.xml
@@ -1277,6 +1277,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'yes' vendor=3D'AMD'>athlon</model>
       <model usable=3D'yes' vendor=3D'Intel'>core2duo</model>
       <model usable=3D'yes' vendor=3D'Intel'>coreduo</model>
diff --git a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml b/tests/domaincapsd=
ata/qemu_6.0.0.x86_64.xml
index 6ecbe63dce..a176cde6d9 100644
--- a/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.0.0.x86_64.xml
@@ -737,6 +737,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'no' vendor=3D'AMD'>athlon</model>
       <blockers model=3D'athlon'>
         <feature name=3D'3dnow'/>
diff --git a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml b/tests/domainc=
apsdata/qemu_6.1.0-q35.x86_64.xml
index e5a90a82bd..ac6d662afc 100644
--- a/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-q35.x86_64.xml
@@ -833,6 +833,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'no' vendor=3D'AMD'>athlon</model>
       <blockers model=3D'athlon'>
         <feature name=3D'3dnow'/>
diff --git a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_6.1.0-tcg.x86_64.xml
index bfe8224c26..7259db82c8 100644
--- a/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0-tcg.x86_64.xml
@@ -1442,6 +1442,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'yes' vendor=3D'AMD'>athlon</model>
       <model usable=3D'yes' vendor=3D'Intel'>core2duo</model>
       <model usable=3D'yes' vendor=3D'Intel'>coreduo</model>
diff --git a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml b/tests/domaincapsd=
ata/qemu_6.1.0.x86_64.xml
index 8318dd3774..682fff3b61 100644
--- a/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.1.0.x86_64.xml
@@ -832,6 +832,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'no' vendor=3D'AMD'>athlon</model>
       <blockers model=3D'athlon'>
         <feature name=3D'3dnow'/>
diff --git a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml b/tests/domainc=
apsdata/qemu_6.2.0-q35.x86_64.xml
index 0e44868d46..5592787eed 100644
--- a/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-q35.x86_64.xml
@@ -839,6 +839,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'no' vendor=3D'AMD'>athlon</model>
       <blockers model=3D'athlon'>
         <feature name=3D'3dnow'/>
diff --git a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_6.2.0-tcg.x86_64.xml
index 877e135343..6dbcc900a8 100644
--- a/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0-tcg.x86_64.xml
@@ -1458,6 +1458,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'yes' vendor=3D'AMD'>athlon</model>
       <model usable=3D'yes' vendor=3D'Intel'>core2duo</model>
       <model usable=3D'yes' vendor=3D'Intel'>coreduo</model>
diff --git a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml b/tests/domaincapsd=
ata/qemu_6.2.0.x86_64.xml
index 25c057ccbf..8dcfb48a09 100644
--- a/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_6.2.0.x86_64.xml
@@ -838,6 +838,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'no' vendor=3D'AMD'>athlon</model>
       <blockers model=3D'athlon'>
         <feature name=3D'3dnow'/>
diff --git a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml b/tests/domainc=
apsdata/qemu_7.0.0-q35.x86_64.xml
index 57fff049c8..7e837256e3 100644
--- a/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-q35.x86_64.xml
@@ -866,6 +866,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'no' vendor=3D'AMD'>athlon</model>
       <blockers model=3D'athlon'>
         <feature name=3D'3dnow'/>
diff --git a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_7.0.0-tcg.x86_64.xml
index 54635c84ac..24e0046d6b 100644
--- a/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0-tcg.x86_64.xml
@@ -1485,6 +1485,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'yes' vendor=3D'AMD'>athlon</model>
       <model usable=3D'yes' vendor=3D'Intel'>core2duo</model>
       <model usable=3D'yes' vendor=3D'Intel'>coreduo</model>
diff --git a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml b/tests/domaincapsd=
ata/qemu_7.0.0.x86_64.xml
index 2ad9f0b60c..9e9651e449 100644
--- a/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.0.0.x86_64.xml
@@ -865,6 +865,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'no' vendor=3D'AMD'>athlon</model>
       <blockers model=3D'athlon'>
         <feature name=3D'3dnow'/>
diff --git a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml b/tests/domainc=
apsdata/qemu_7.1.0-q35.x86_64.xml
index 20d87fa75c..23e4204b47 100644
--- a/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-q35.x86_64.xml
@@ -833,6 +833,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'no' vendor=3D'AMD'>athlon</model>
       <blockers model=3D'athlon'>
         <feature name=3D'3dnow'/>
diff --git a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_7.1.0-tcg.x86_64.xml
index 769be5f99a..0ce088e308 100644
--- a/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0-tcg.x86_64.xml
@@ -1433,6 +1433,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'yes' vendor=3D'AMD'>athlon</model>
       <model usable=3D'yes' vendor=3D'Intel'>core2duo</model>
       <model usable=3D'yes' vendor=3D'Intel'>coreduo</model>
diff --git a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml b/tests/domaincapsd=
ata/qemu_7.1.0.x86_64.xml
index 2b768d9258..7f42c7fb84 100644
--- a/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.1.0.x86_64.xml
@@ -832,6 +832,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'no' vendor=3D'AMD'>athlon</model>
       <blockers model=3D'athlon'>
         <feature name=3D'3dnow'/>
diff --git a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml b/tests/domainc=
apsdata/qemu_7.2.0-q35.x86_64.xml
index 576ca119a6..60c032ddd2 100644
--- a/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-q35.x86_64.xml
@@ -838,6 +838,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'no' vendor=3D'AMD'>athlon</model>
       <blockers model=3D'athlon'>
         <feature name=3D'3dnow'/>
diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml b/tests/dom=
aincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
index 9abf3506bf..908d2a1b52 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64+hvf.xml
@@ -1182,6 +1182,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'yes' vendor=3D'AMD'>athlon</model>
       <model usable=3D'yes' vendor=3D'Intel'>core2duo</model>
       <model usable=3D'yes' vendor=3D'Intel'>coreduo</model>
diff --git a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_7.2.0-tcg.x86_64.xml
index 9abf3506bf..908d2a1b52 100644
--- a/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0-tcg.x86_64.xml
@@ -1182,6 +1182,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'yes' vendor=3D'AMD'>athlon</model>
       <model usable=3D'yes' vendor=3D'Intel'>core2duo</model>
       <model usable=3D'yes' vendor=3D'Intel'>coreduo</model>
diff --git a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml b/tests/domaincapsd=
ata/qemu_7.2.0.x86_64.xml
index 1d294bdd06..c41076c48f 100644
--- a/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_7.2.0.x86_64.xml
@@ -837,6 +837,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'no' vendor=3D'AMD'>athlon</model>
       <blockers model=3D'athlon'>
         <feature name=3D'3dnow'/>
diff --git a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml b/tests/domainc=
apsdata/qemu_8.0.0-q35.x86_64.xml
index fc0c9d320b..7b88e5d27c 100644
--- a/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-q35.x86_64.xml
@@ -920,6 +920,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'no' vendor=3D'AMD'>athlon</model>
       <blockers model=3D'athlon'>
         <feature name=3D'3dnow'/>
diff --git a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_8.0.0-tcg.x86_64.xml
index d1a6270237..0834c1ac06 100644
--- a/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0-tcg.x86_64.xml
@@ -1278,6 +1278,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'yes' vendor=3D'AMD'>athlon</model>
       <model usable=3D'yes' vendor=3D'Intel'>core2duo</model>
       <model usable=3D'yes' vendor=3D'Intel'>coreduo</model>
diff --git a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml b/tests/domaincapsd=
ata/qemu_8.0.0.x86_64.xml
index b61b7dbddb..f4e878dd40 100644
--- a/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.0.0.x86_64.xml
@@ -919,6 +919,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'no' vendor=3D'AMD'>athlon</model>
       <blockers model=3D'athlon'>
         <feature name=3D'3dnow'/>
diff --git a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml b/tests/domainc=
apsdata/qemu_8.1.0-q35.x86_64.xml
index d225ecae4b..381a048f1b 100644
--- a/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-q35.x86_64.xml
@@ -1109,6 +1109,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'no' vendor=3D'AMD'>athlon</model>
       <blockers model=3D'athlon'>
         <feature name=3D'3dnow'/>
diff --git a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_8.1.0-tcg.x86_64.xml
index caaf0dfe84..928aede1c5 100644
--- a/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0-tcg.x86_64.xml
@@ -1236,6 +1236,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'yes' vendor=3D'AMD'>athlon</model>
       <model usable=3D'yes' vendor=3D'Intel'>core2duo</model>
       <model usable=3D'yes' vendor=3D'Intel'>coreduo</model>
diff --git a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml b/tests/domaincapsd=
ata/qemu_8.1.0.x86_64.xml
index 6ef35d465b..c727d391e4 100644
--- a/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.1.0.x86_64.xml
@@ -1108,6 +1108,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'no' vendor=3D'AMD'>athlon</model>
       <blockers model=3D'athlon'>
         <feature name=3D'3dnow'/>
diff --git a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml b/tests/domainc=
apsdata/qemu_8.2.0-q35.x86_64.xml
index f912d65ff5..454040f6a8 100644
--- a/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-q35.x86_64.xml
@@ -1110,6 +1110,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'no' vendor=3D'AMD'>athlon</model>
       <blockers model=3D'athlon'>
         <feature name=3D'3dnow'/>
diff --git a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_8.2.0-tcg.x86_64.xml
index 76b4853af6..9ee0bedc51 100644
--- a/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0-tcg.x86_64.xml
@@ -1217,6 +1217,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'yes' vendor=3D'AMD'>athlon</model>
       <model usable=3D'yes' vendor=3D'Intel'>core2duo</model>
       <model usable=3D'yes' vendor=3D'Intel'>coreduo</model>
diff --git a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml b/tests/domaincapsd=
ata/qemu_8.2.0.x86_64.xml
index f9d96fb8fe..0f706b8b5f 100644
--- a/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_8.2.0.x86_64.xml
@@ -1109,6 +1109,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'no' vendor=3D'AMD'>athlon</model>
       <blockers model=3D'athlon'>
         <feature name=3D'3dnow'/>
diff --git a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml b/tests/domainc=
apsdata/qemu_9.0.0-q35.x86_64.xml
index 6d371660ce..0f5b7cd5a2 100644
--- a/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-q35.x86_64.xml
@@ -1110,6 +1110,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'no' vendor=3D'AMD'>athlon</model>
       <blockers model=3D'athlon'>
         <feature name=3D'3dnow'/>
diff --git a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_9.0.0-tcg.x86_64.xml
index b4f8542b55..d7b182f43e 100644
--- a/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0-tcg.x86_64.xml
@@ -1152,6 +1152,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'yes' vendor=3D'AMD'>athlon</model>
       <model usable=3D'yes' vendor=3D'Intel'>core2duo</model>
       <model usable=3D'yes' vendor=3D'Intel'>coreduo</model>
diff --git a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml b/tests/domaincapsd=
ata/qemu_9.0.0.x86_64.xml
index 463478f13d..aafdd4e359 100644
--- a/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.0.0.x86_64.xml
@@ -1109,6 +1109,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'no' vendor=3D'AMD'>athlon</model>
       <blockers model=3D'athlon'>
         <feature name=3D'3dnow'/>
diff --git a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml b/tests/domainc=
apsdata/qemu_9.1.0-q35.x86_64.xml
index fd509ca52c..888a02a420 100644
--- a/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-q35.x86_64.xml
@@ -1246,6 +1246,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'no' vendor=3D'AMD'>athlon</model>
       <blockers model=3D'athlon'>
         <feature name=3D'3dnow'/>
diff --git a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_9.1.0-tcg.x86_64.xml
index 7d95b9c32f..26431fc647 100644
--- a/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0-tcg.x86_64.xml
@@ -1257,6 +1257,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'yes' vendor=3D'AMD'>athlon</model>
       <model usable=3D'yes' vendor=3D'Intel'>core2duo</model>
       <model usable=3D'yes' vendor=3D'Intel'>coreduo</model>
diff --git a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml b/tests/domaincapsd=
ata/qemu_9.1.0.x86_64.xml
index 937b6671ef..7eb449b9e2 100644
--- a/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.1.0.x86_64.xml
@@ -1245,6 +1245,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'no' vendor=3D'AMD'>athlon</model>
       <blockers model=3D'athlon'>
         <feature name=3D'3dnow'/>
diff --git a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml b/tests/domainc=
apsdata/qemu_9.2.0-q35.x86_64.xml
index be67479619..730d8e9e26 100644
--- a/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-q35.x86_64.xml
@@ -1246,6 +1246,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'no' vendor=3D'AMD'>athlon</model>
       <blockers model=3D'athlon'>
         <feature name=3D'3dnow'/>
diff --git a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml b/tests/domainc=
apsdata/qemu_9.2.0-tcg.x86_64.xml
index fa183e1394..d98ab20f88 100644
--- a/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0-tcg.x86_64.xml
@@ -1257,6 +1257,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'yes' vendor=3D'AMD'>athlon</model>
       <model usable=3D'yes' vendor=3D'Intel'>core2duo</model>
       <model usable=3D'yes' vendor=3D'Intel'>coreduo</model>
diff --git a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml b/tests/domaincapsd=
ata/qemu_9.2.0.x86_64.xml
index ac21366d12..558415500f 100644
--- a/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
+++ b/tests/domaincapsdata/qemu_9.2.0.x86_64.xml
@@ -1245,6 +1245,11 @@
       <blockers model=3D'Westmere-IBRS'>
         <feature name=3D'spec-ctrl'/>
       </blockers>
+      <model usable=3D'yes' vendor=3D'Intel'>Westmere-v1</model>
+      <model usable=3D'no' vendor=3D'Intel'>Westmere-v2</model>
+      <blockers model=3D'Westmere-v2'>
+        <feature name=3D'spec-ctrl'/>
+      </blockers>
       <model usable=3D'no' vendor=3D'AMD'>athlon</model>
       <blockers model=3D'athlon'>
         <feature name=3D'3dnow'/>
--=20
2.47.0