Given our min QEMU, it doesn't seem like we need to support either the old "-feature" / "+feature" syntax, nor the bare "feature" syntax. I'm pretty unsure about the last patch in this series, given the impact it had on test data files. If it is indeed ok though, we can delete two capabilities too. v3: - Now with more fine grained patches and cleanups to avoid the bugs v2: - Now with cpu name compatibility retained Daniel P. Berrangé (6): qemu: always translate underscores to hyphens in CPU features qemu: always use hyphens in hyperv feature names qemu: remove use of (+|-)name syntax for -cpu featres qemu: inline the qemuBuildCpuFeature code qemu: remove use of implicit boolean syntax for guest features qemu: drop support for full CPU model expansion src/qemu/qemu_capabilities.c | 15 +- src/qemu/qemu_command.c | 46 +- src/qemu/qemu_monitor.h | 1 - src/qemu/qemu_monitor_json.c | 15 - .../caps_2.11.0.x86_64.replies | 2564 ++---------- .../caps_2.11.0.x86_64.xml | 182 +- .../caps_2.12.0.x86_64.replies | 3036 +++------------ .../caps_2.12.0.x86_64.xml | 194 +- .../caps_3.0.0.x86_64.replies | 3130 ++++----------- .../caps_3.0.0.x86_64.xml | 204 +- .../caps_3.1.0.x86_64.replies | 3436 ++++------------ .../caps_3.1.0.x86_64.xml | 218 +- .../caps_4.0.0.x86_64.replies | 3452 ++++------------- .../caps_4.0.0.x86_64.xml | 226 +- .../clock-timer-hyperv-rtc.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell2.args | 2 +- tests/qemuxml2argvdata/cpu-Haswell3.args | 2 +- .../qemuxml2argvdata/cpu-cache-disable3.args | 2 +- .../cpu-check-default-partial.args | 2 +- tests/qemuxml2argvdata/cpu-eoi-disabled.args | 2 +- tests/qemuxml2argvdata/cpu-eoi-enabled.args | 2 +- tests/qemuxml2argvdata/cpu-exact1.args | 2 +- .../cpu-exact2-nofallback.args | 2 +- tests/qemuxml2argvdata/cpu-exact2.args | 2 +- tests/qemuxml2argvdata/cpu-fallback.args | 2 +- tests/qemuxml2argvdata/cpu-host-kvmclock.args | 2 +- .../qemuxml2argvdata/cpu-host-model-cmt.args | 2 +- .../cpu-host-model-cmt.x86_64-4.0.0.args | 2 +- .../cpu-host-model-fallback.args | 2 +- .../cpu-host-model-vendor.args | 2 +- tests/qemuxml2argvdata/cpu-host-model.args | 2 +- .../cpu-host-model.x86_64-2.11.0.args | 2 +- .../cpu-host-model.x86_64-2.12.0.args | 2 +- .../cpu-host-model.x86_64-3.0.0.args | 2 +- .../cpu-host-model.x86_64-3.1.0.args | 2 +- .../cpu-host-model.x86_64-4.0.0.args | 2 +- .../cpu-host-passthrough-features.args | 2 +- tests/qemuxml2argvdata/cpu-kvmclock.args | 2 +- tests/qemuxml2argvdata/cpu-minimum1.args | 2 +- tests/qemuxml2argvdata/cpu-minimum2.args | 2 +- tests/qemuxml2argvdata/cpu-strict1.args | 2 +- .../cpu-translation.x86_64-4.0.0.args | 2 +- tests/qemuxml2argvdata/cpu-tsc-frequency.args | 2 +- .../cpu-tsc-frequency.x86_64-4.0.0.args | 2 +- .../eoi-disabled.x86_64-4.0.0.args | 2 +- .../eoi-enabled.x86_64-4.0.0.args | 2 +- .../graphics-spice-timeout.args | 2 +- .../hyperv-stimer-direct.x86_64-latest.args | 2 +- .../qemuxml2argvdata/hyperv.x86_64-4.0.0.args | 2 +- .../hyperv.x86_64-latest.args | 2 +- .../kvmclock+eoi-disabled.x86_64-4.0.0.args | 2 +- tests/qemuxml2argvdata/kvmclock.args | 2 +- .../pci-bridge-many-disks.args | 2 +- .../pv-spinlock-disabled.x86_64-4.0.0.args | 2 +- .../pv-spinlock-enabled.x86_64-4.0.0.args | 2 +- 55 files changed, 3438 insertions(+), 13363 deletions(-) -- 2.31.1
