Thanks for the discussion on v1. I was rerunning the tests to make
the tests pass.
I have not made it prefer -IBRS types before -noTS-IBRS types
as outlined in my former reply to this thread. But I wanted to submit
the v2 to have this topic make some progress without waiting for the
potentially long "should we prefer -IBRS discussion".

Updates in v2:
- fix model names in new cpu_map files
- update domaincapsdata to match the new models
- update cputestdata to match the new models

Christian Ehrhardt (1):
  cpu_map: Add more -noTSX x86 CPU models

 src/cpu_map/Makefile.inc.am                     |  5 ++
 src/cpu_map/index.xml                           |  5 ++
 src/cpu_map/x86_Cascadelake-Server-noTSX.xml    | 78 ++++++++++++++++
 src/cpu_map/x86_Icelake-Client-noTSX.xml        | 81 +++++++++++++++++
 src/cpu_map/x86_Icelake-Server-noTSX.xml        | 90 +++++++++++++++++++
 src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml   | 73 +++++++++++++++
 src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml   | 75 ++++++++++++++++
 tests/x86_64-cpuid-Core-i7-8550U-guest.xml      |  4 +-
 tests/x86_64-cpuid-Core-i7-8550U-host.xml       | 11 +--
 tests/x86_64-cpuid-Core-i7-8550U-json.xml       |  4 +-
 tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml  |  5 ++
 tests/domaincapsdata/qemu_4.2.0-tcg.x86_64.xml  |  5 ++
 tests/domaincapsdata/qemu_4.2.0.x86_64.xml      |  5 ++
 tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml  |  5 ++
 tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml  |  5 ++
 tests/domaincapsdata/qemu_5.0.0.x86_64.xml      |  5 ++
 16 files changed, 440 insertions(+), 16 deletions(-)
 create mode 100644 src/cpu_map/x86_Cascadelake-Server-noTSX.xml
 create mode 100644 src/cpu_map/x86_Icelake-Client-noTSX.xml
 create mode 100644 src/cpu_map/x86_Icelake-Server-noTSX.xml
 create mode 100644 src/cpu_map/x86_Skylake-Client-noTSX-IBRS.xml
 create mode 100644 src/cpu_map/x86_Skylake-Server-noTSX-IBRS.xml

-- 
2.25.1