diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 551020cadcfc1e4dee4a5a29cec1507c800f6b80..62149367b10690035f99eecfe025dfebefa198bf 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1022,10 +1022,10 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] = { "rdctl-no", "ibrs-all", "rsba", "skip-l1dfl-vmentry", "ssb-no", "mds-no", "pschange-mc-no", "tsx-ctrl", "taa-no", NULL, NULL, NULL, - NULL, NULL, NULL, NULL, + NULL, "sbdr-ssdp-no", "fbsdp-no", "psdp-no", NULL, "fb-clear", NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, "rfds-no", + "pbrsb-no", NULL, NULL, "rfds-no", "rfds-clear", NULL, NULL, NULL, }, .msr = { @@ -3762,8 +3762,28 @@ static const X86CPUDefinition builtin_x86_defs[] = { .model_id = "Intel Xeon Processor (SapphireRapids)", .versions = (X86CPUVersionDefinition[]) { { .version = 1 }, - { /* end of list */ }, - }, + { + .version = 2, + .props = (PropValue[]) { + { "sbdr-ssdp-no", "on" }, + { "fbsdp-no", "on" }, + { "psdp-no", "on" }, + { /* end of list */ } + } + }, + { + .version = 3, + .props = (PropValue[]) { + { "ss", "on" }, + { "tsc-adjust", "on" }, + { "cldemote", "on" }, + { "movdiri", "on" }, + { "movdir64b", "on" }, + { /* end of list */ } + } + }, + { /* end of list */ } + } }, { .name = "SierraForest", @@ -4519,17 +4539,6 @@ static const X86CPUDefinition builtin_x86_defs[] = { { /* end of list */ } } }, - { - .version = 3, - .props = (PropValue[]) { - { "ss", "on" }, - { "tsc-adjust", "on" }, - { "cldemote", "on" }, - { "movdiri", "on" }, - { "movdir64b", "on" }, - { /* end of list */ } - } - }, { /* end of list */ } } },