On Tue, Sep 22, 2020 at 03:14:15PM +0800, Robert Hoo wrote:
> Going to obsolete Icelake-Client CPU models in the future.
>
> Signed-off-by: Robert Hoo
> ---
> Change log
> v4:
> Deprecation note is general now. More detailed information is moved to
> docs/system/deprecated.rst.
>
> v3:
> Obsolete in v5.2 --> v5.3.
>
> ---
> docs/system/deprecated.rst | 6 ++
> 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 0cb8b01..5dc2ff3 100644
> --- a/docs/system/deprecated.rst
> +++ b/docs/system/deprecated.rst
> @@ -329,6 +329,12 @@ The ``compat`` property used to set backwards
> compatibility modes for
> the processor has been deprecated. The ``max-cpu-compat`` property of
> the ``pseries`` machine type should be used instead.
>
> +``Icelake-Client`` CPU Model (since 3.1)
> +
> +
> +``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 323c7e3..5566356 100644
> --- a/target/i386/cpu.c
> +++ b/target/i386/cpu.c
> @@ -3358,10 +3358,13 @@ static X86CPUDefinition builtin_x86_defs[] = {
> .xlevel = 0x8008,
> .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 = "Deprecated. Use Icelake-Server instead."
This results in the following message:
qemu-system-x86_64: warning: CPU model Icelake-Client-x86_64-cpu is
deprecated -- Deprecated. Use Icelake-Server instead.
There's no need to say "deprecate" twice.
I'm changing it to "use Icelake-Server instead" and queueing on x86-next.
Thanks!
> },
> {
> .name = "Icelake-Server",
> --
> 1.8.3.1
>
--
Eduardo
