i386: Mark Icelake-Client CPU models deprecated

Icelake-Client CPU models will be removed in the future.

Signed-off-by: Robert Hoo <robert.hu@linux.intel.com>
Message-Id: <1600758855-80046-2-git-send-email-robert.hu@linux.intel.com>
[ehabkost: reword deprecation note, fix version in doc]
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Robert Hoo 2020-09-22 15:14:15 +08:00 committed by Eduardo Habkost
parent 61ad65d0f0
commit 3e6a015cbd
2 changed files with 13 additions and 3 deletions

View file

@ -314,6 +314,12 @@ a future version of QEMU. Support for this CPU was removed from the
upstream Linux kernel, and there is no available upstream toolchain upstream Linux kernel, and there is no available upstream toolchain
to build binaries for it. to build binaries for it.
``Icelake-Client`` CPU Model (since 5.2.0)
''''''''''''''''''''''''''''''''''''''''''
``Icelake-Client`` CPU Models are deprecated. Use ``Icelake-Server`` CPU
Models instead.
System emulator devices System emulator devices
----------------------- -----------------------

View file

@ -3358,10 +3358,13 @@ static X86CPUDefinition builtin_x86_defs[] = {
.xlevel = 0x80000008, .xlevel = 0x80000008,
.model_id = "Intel Core Processor (Icelake)", .model_id = "Intel Core Processor (Icelake)",
.versions = (X86CPUVersionDefinition[]) { .versions = (X86CPUVersionDefinition[]) {
{ .version = 1 }, {
.version = 1,
.note = "deprecated"
},
{ {
.version = 2, .version = 2,
.note = "no TSX", .note = "no TSX, deprecated",
.alias = "Icelake-Client-noTSX", .alias = "Icelake-Client-noTSX",
.props = (PropValue[]) { .props = (PropValue[]) {
{ "hle", "off" }, { "hle", "off" },
@ -3370,7 +3373,8 @@ static X86CPUDefinition builtin_x86_defs[] = {
}, },
}, },
{ /* end of list */ } { /* end of list */ }
} },
.deprecation_note = "use Icelake-Server instead"
}, },
{ {
.name = "Icelake-Server", .name = "Icelake-Server",