From: Zhao Liu <[email protected]> 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 <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Paolo Bonzini <[email protected]> --- target/i386/cpu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 05121c5b324..cd44a624201 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 */ }, -- 2.53.0
