This is another step in revisiting all APIs provided by the cpu driver and making them a bit more sane. As with the previous round(s), the updated APIs will gain virCPU prefix so that they can be easily distinguished from the ones that still need some work. Jiri Denemark (14): cpu: Rename cpuGetModels cpu: Rename and document cpuModelIsAllowed cpu: Rename cpuDataParse cpu: Rename cpuDataFormat cputest: Don't use preferred model for minimum match CPUs cputest: Don't use unsupported preferred model cputest: Don't use preferred model with forbidden fallback cputest: Don't use superfluous preferred model cputest: Don't use preferred CPU model at all cpu: Make models array in virCPUTranslate constant cputest: Don't test cpuGuestData cpu: Introduce virCPUConvertLegacy API cpu: Avoid adding <vendor> to custom CPUs cpu: Drop cpuGuestData src/conf/cpu_conf.c | 28 ++++- src/conf/cpu_conf.h | 3 +- src/cpu/cpu.c | 115 +++++++++++---------- src/cpu/cpu.h | 50 ++++----- src/cpu/cpu_arm.c | 12 +-- src/cpu/cpu_ppc64.c | 45 +++----- src/cpu/cpu_s390.c | 1 - src/cpu/cpu_x86.c | 36 ++----- src/libvirt_private.syms | 8 +- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_process.c | 6 +- src/test/test_driver.c | 2 +- tests/cputest.c | 104 ++++++++----------- .../ppc64-host+guest,ppc_models-result.xml | 2 - .../ppc64-host+guest-legacy,ppc_models-result.xml | 2 - .../cputestdata/x86-host+guest,model486-result.xml | 16 ++- .../x86-host+guest,models,Penryn-result.xml | 13 --- .../x86-host+guest,models,qemu64-result.xml | 13 --- tests/cputestdata/x86-host+guest,models-result.xml | 16 +-- tests/cputestdata/x86-host+guest-result.xml | 18 ++-- ... => x86-host+host+host-model,models-result.xml} | 3 +- tests/cputestdata/x86-host+min.xml | 1 - tests/cputestdata/x86-host+penryn-force-result.xml | 5 +- tests/cputestdata/x86-host+pentium3.xml | 1 - .../x86-host+strict-force-extra-result.xml | 31 +++--- ...-host-Haswell-noTSX+Haswell,haswell-result.xml} | 4 +- ...Haswell-noTSX+Haswell-noTSX,haswell-result.xml} | 2 +- ...86-host-Haswell-noTSX+Haswell-noTSX-result.xml} | 2 +- .../x86-host-better+pentium3,core2duo-result.xml | 21 ---- .../x86-host-better+pentium3,pentium3-result.xml | 30 ------ .../x86-host-better+pentium3-result.xml | 27 +++-- tests/cputestdata/x86-host-worse+guest-result.xml | 18 +++- tests/qemumonitorjsontest.c | 2 +- 34 files changed, 273 insertions(+), 368 deletions(-) delete mode 100644 tests/cputestdata/x86-host+guest,models,Penryn-result.xml delete mode 100644 tests/cputestdata/x86-host+guest,models,qemu64-result.xml rename tests/cputestdata/{x86-host+host+host-model,models,Penryn-result.xml => x86-host+host+host-model,models-result.xml} (89%) rename tests/cputestdata/{x86-host-Haswell-noTSX+Haswell-noTSX,haswell,Haswell-noTSX-result.xml => x86-host-Haswell-noTSX+Haswell,haswell-result.xml} (77%) rename tests/cputestdata/{x86-host-Haswell-noTSX+Haswell,haswell,Haswell-result.xml => x86-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml} (77%) rename tests/cputestdata/{x86-host-Haswell-noTSX+Haswell-noTSX,Haswell-noTSX-result.xml => x86-host-Haswell-noTSX+Haswell-noTSX-result.xml} (64%) delete mode 100644 tests/cputestdata/x86-host-better+pentium3,core2duo-result.xml delete mode 100644 tests/cputestdata/x86-host-better+pentium3,pentium3-result.xml -- 2.10.2 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list