On Fri, Dec 15, 2023 at 04:11:58PM -0600, Jonathon Jongsma wrote: > Signed-off-by: Jonathon Jongsma <jjongsma@xxxxxxxxxx> > --- > src/cpu_map/x86_Broadwell-IBRS.xml | 1 + > src/cpu_map/x86_Broadwell-noTSX-IBRS.xml | 1 + > src/cpu_map/x86_Broadwell-noTSX.xml | 1 + > src/cpu_map/x86_Broadwell.xml | 1 + > src/cpu_map/x86_Cascadelake-Server-noTSX.xml | 1 + > src/cpu_map/x86_Cascadelake-Server.xml | 1 + > src/cpu_map/x86_Cooperlake.xml | 1 + > src/cpu_map/x86_Dhyana.xml | 1 + > src/cpu_map/x86_EPYC-IBPB.xml | 1 + > src/cpu_map/x86_EPYC-Milan.xml | 1 + > src/cpu_map/x86_EPYC-Rome.xml | 1 + > src/cpu_map/x86_EPYC.xml | 1 + > src/cpu_map/x86_Haswell-IBRS.xml | 1 + > src/cpu_map/x86_Haswell-noTSX-IBRS.xml | 1 + > src/cpu_map/x86_Haswell-noTSX.xml | 1 + > src/cpu_map/x86_Haswell.xml | 1 + > src/cpu_map/x86_Icelake-Server-noTSX.xml | 1 + > src/cpu_map/x86_Icelake-Server.xml | 1 + > src/cpu_map/x86_IvyBridge-IBRS.xml | 1 + > src/cpu_map/x86_IvyBridge.xml | 1 + > src/cpu_map/x86_Nehalem-IBRS.xml | 1 + > src/cpu_map/x86_Nehalem.xml | 1 + > src/cpu_map/x86_SandyBridge-IBRS.xml | 1 + > src/cpu_map/x86_SandyBridge.xml | 1 + > src/cpu_map/x86_SapphireRapids.xml | 1 + > src/cpu_map/x86_Skylake-Client-IBRS.xml | 1 + > src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml | 1 + > src/cpu_map/x86_Skylake-Client.xml | 1 + > src/cpu_map/x86_Skylake-Server-IBRS.xml | 1 + > src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml | 1 + > src/cpu_map/x86_Skylake-Server.xml | 1 + > src/cpu_map/x86_Snowridge.xml | 1 + > src/cpu_map/x86_Westmere-IBRS.xml | 1 + > src/cpu_map/x86_Westmere.xml | 1 + > 34 files changed, 34 insertions(+) > > diff --git a/src/cpu_map/x86_Broadwell-IBRS.xml b/src/cpu_map/x86_Broadwell-IBRS.xml > index 9033d5fcd5..13568eac81 100644 > --- a/src/cpu_map/x86_Broadwell-IBRS.xml > +++ b/src/cpu_map/x86_Broadwell-IBRS.xml > @@ -1,5 +1,6 @@ > <cpus> > <model name='Broadwell-IBRS'> > + <canonical_name>Broadwell-v3</canonical_name> > <decode host='on' guest='on'/> > <signature family='6' model='61'/> <!-- 0306d0 --> > <signature family='6' model='71'/> <!-- 040670 --> > diff --git a/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml b/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml > index c044b60e36..4ec35ce3a2 100644 > --- a/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml > +++ b/src/cpu_map/x86_Broadwell-noTSX-IBRS.xml > @@ -1,5 +1,6 @@ > <cpus> > <model name='Broadwell-noTSX-IBRS'> > + <canonical_name>Broadwell-v4</canonical_name> > <decode host='on' guest='on'/> > <signature family='6' model='61'/> <!-- 0306d0 --> > <signature family='6' model='71'/> <!-- 040670 --> > diff --git a/src/cpu_map/x86_Broadwell-noTSX.xml b/src/cpu_map/x86_Broadwell-noTSX.xml > index 637f29ba1c..3fed34e3a4 100644 > --- a/src/cpu_map/x86_Broadwell-noTSX.xml > +++ b/src/cpu_map/x86_Broadwell-noTSX.xml > @@ -1,5 +1,6 @@ > <cpus> > <model name='Broadwell-noTSX'> > + <canonical_name>Broadwell-v2</canonical_name> > <decode host='on' guest='on'/> > <signature family='6' model='61'/> <!-- 0306d0 --> > <signature family='6' model='71'/> <!-- 040670 --> > diff --git a/src/cpu_map/x86_Broadwell.xml b/src/cpu_map/x86_Broadwell.xml > index 82939a4509..79c96c3857 100644 > --- a/src/cpu_map/x86_Broadwell.xml > +++ b/src/cpu_map/x86_Broadwell.xml > @@ -1,5 +1,6 @@ > <cpus> > <model name='Broadwell'> > + <canonical_name>Broadwell-v1</canonical_name> > <decode host='on' guest='on'/> > <signature family='6' model='61'/> <!-- 0306d0 --> > <signature family='6' model='71'/> <!-- 040670 --> In theory the expansion from the plain CPU model names (ie without the noXXXX suffix) can vary per machine type. In practice QEMU has never changed it thus far, so its always 'v1'. Lets be clear that although this expansion can vary per machine type, libvirt's CPU model database is independant of machine type, and thus we've decided to arbitrary fix the base CPU model names to the '-v1' CPU models. Can you put something in the commit message to this effect. With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :| _______________________________________________ Devel mailing list -- devel@xxxxxxxxxxxxxxxxx To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxx
