Commit 709ade3bbb for qemu.org
commit 709ade3bbbfc206c7a1712cadcc81e55ab1fa2fd
Author: Zhao Liu <zhao1.liu@intel.com>
Date: Tue Mar 10 22:08:18 2026 +0800
i386/cpu: Adjust the note for CPU models with its-no
For new versioned CPU models with its-no enabled, since CET was already
enabled in previous versions, remove the related description from the
notes of its-no related CPU models.
Signed-off-by: Zhao Liu <zhao1.liu@intel.com>
Link: https://lore.kernel.org/r/20260310140819.1563084-5-zhao1.liu@intel.com
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 05121c5b32..cd44a62420 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -5263,7 +5263,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
},
{
.version = 6,
- .note = "with cet-ss, cet-ibt, its-no",
+ .note = "with its-no",
.props = (PropValue[]) {
{ "its-no", "on" },
{ /* end of list */ },
@@ -5444,7 +5444,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
},
{
.version = 5,
- .note = "with cet-ss, cet-ibt, its-no",
+ .note = "with its-no",
.props = (PropValue[]) {
{ "its-no", "on" },
{ /* end of list */ },
@@ -5809,7 +5809,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
},
{
.version = 5,
- .note = "with ITS_NO",
+ .note = "with its-no",
.props = (PropValue[]) {
{ "its-no", "on" },
{ /* end of list */ },
@@ -5963,7 +5963,7 @@ static const X86CPUDefinition builtin_x86_defs[] = {
},
{
.version = 3,
- .note = "with cet-ss, cet-ibt, ITS_NO",
+ .note = "with its-no",
.props = (PropValue[]) {
{ "its-no", "on" },
{ /* end of list */ },