diff options
| author | Robert Hoo <robert.hu@linux.intel.com> | 2020-09-22 15:14:15 +0800 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2020-10-14 15:28:55 -0400 |
| commit | 3e6a015cbd0f61c19cdc02d5ce74a3e60235cb9a (patch) | |
| tree | 32add2d68eb66d09067a0b6d38cebd1e8bea281c | |
| parent | 61ad65d0f01d928b259effb57e2a356f3e3dac03 (diff) | |
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>
| -rw-r--r-- | docs/system/deprecated.rst | 6 | ||||
| -rw-r--r-- | target/i386/cpu.c | 10 |
2 files changed, 13 insertions, 3 deletions
diff --git a/docs/system/deprecated.rst b/docs/system/deprecated.rst index 09ec8b1ae8..21d122c49a 100644 --- a/docs/system/deprecated.rst +++ b/docs/system/deprecated.rst @@ -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 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 ----------------------- diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 2e3ee41c56..576746d763 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -3358,10 +3358,13 @@ static X86CPUDefinition builtin_x86_defs[] = { .xlevel = 0x80000008, .model_id = "Intel Core Processor (Icelake)", .versions = (X86CPUVersionDefinition[]) { - { .version = 1 }, + { + .version = 1, + .note = "deprecated" + }, { .version = 2, - .note = "no TSX", + .note = "no TSX, deprecated", .alias = "Icelake-Client-noTSX", .props = (PropValue[]) { { "hle", "off" }, @@ -3370,7 +3373,8 @@ static X86CPUDefinition builtin_x86_defs[] = { }, }, { /* end of list */ } - } + }, + .deprecation_note = "use Icelake-Server instead" }, { .name = "Icelake-Server", |