Re: [Qemu-devel] [PULL v3 40/42] i386: Add Cascadelake-Server-v2 CPU model

[Eduardo Habkost]

On Wed, Jul 03, 2019 at 09:16:57AM +0800, Xiaoyao Li wrote:
> Hi, Eduardo
> 
> On 7/2/2019 11:35 PM, Eduardo Habkost wrote:
> > Add new version of Cascadelake-Server CPU model, setting
> > stepping=5 and enabling the IA32_ARCH_CAPABILITIES MSR
> > with some flags.
> > 
> > The new feature will introduce a new host software requirement,
> > breaking our CPU model runnability promises.  This means we can't
> > enable the new CPU model version by default in QEMU 4.1, because
> > management software isn't ready yet to resolve CPU model aliases.
> > This is why "pc-*-4.1" will keep returning Cascadelake-Server-v1
> > if "-cpu Cascadelake-Server" is specified.
> > 
> > Includes a test case to ensure the right combinations of
> > machine-type + CPU model + command-line feature flags will work
> > as expected.
> > 
> > Signed-off-by: Eduardo Habkost <address@hidden>
> > Message-Id: <address@hidden>
> > Reviewed-by: Daniel P. Berrangé <address@hidden>
> > Signed-off-by: Eduardo Habkost <address@hidden>
> > ---
> >   target/i386/cpu.c                          | 14 +++++
> >   tests/acceptance/x86_cpu_model_versions.py | 73 ++++++++++++++++++++++
> >   2 files changed, 87 insertions(+)
> > 
> > diff --git a/target/i386/cpu.c b/target/i386/cpu.c
> > index 9b16cffb22..0298396a91 100644
> > --- a/target/i386/cpu.c
> > +++ b/target/i386/cpu.c
> > @@ -2343,6 +2343,20 @@ static X86CPUDefinition builtin_x86_defs[] = {
> >               CPUID_6_EAX_ARAT,
> >           .xlevel = 0x80000008,
> >           .model_id = "Intel Xeon Processor (Cascadelake)",
> > +        .versions = (X86CPUVersionDefinition[]) {
> > +            { .version = 1 },
> > +            { .version = 2,
> > +              .props = (PropValue[]) {
> > +                  { "stepping", "5" },
> > +                  { "arch-capabilities", "on" },
> > +                  { "rdctl-no", "on" },
> > +                  { "ibrs-all", "on" },
> > +                  { "skip-l1dfl-vmentry", "on" },
> > +                  { /* end of list */ }
> > +              },
> > +            },
> > +            { /* end of list */ }
> > +        }
> 
> seems you forgot to fix the stepping and add feature "mds-no".

I plan to fix it in a follow up patch to avoid holding the
current pull request for another day.

-- 
Eduardo