We must honour the QEMU built-in default machine when converting from argv

Daniel P. Berrangé (3):
  qemu: record the QEMU default machine in capabilities
  qemu: rename method for getting preferred machine type
  qemu: fix default machine for argv -> xml convertor

 src/qemu/qemu_capabilities.c                  | 37 ++++++++++++++---
 src/qemu/qemu_capabilities.h                  |  3 +-
 src/qemu/qemu_driver.c                        |  6 ++-
 src/qemu/qemu_parse_command.c                 | 34 ++++++++++------
 src/qemu/qemu_parse_command.h                 |  8 +++-
 tests/domaincapstest.c                        |  2 +-
 tests/qemuargv2xmldata/nomachine-aarch64.args | 11 -----
 tests/qemuargv2xmldata/nomachine-aarch64.xml  | 40 -------------------
 tests/qemuargv2xmldata/nomachine-ppc64.xml    |  4 +-
 tests/qemuargv2xmldata/nomachine-x86_64.xml   |  4 +-
 tests/qemuargv2xmldata/pseries-disk.xml       |  4 +-
 tests/qemuargv2xmldata/pseries-nvram.xml      |  4 +-
 tests/qemuargv2xmltest.c                      | 18 ++++++++-
 .../caps_1.5.3.x86_64.xml                     |  2 +-
 .../caps_1.6.0.x86_64.xml                     |  2 +-
 .../caps_1.7.0.x86_64.xml                     |  2 +-
 .../caps_2.1.1.x86_64.xml                     |  2 +-
 .../caps_2.10.0.ppc64.xml                     |  2 +-
 .../caps_2.10.0.s390x.xml                     |  2 +-
 .../caps_2.10.0.x86_64.xml                    |  2 +-
 .../caps_2.11.0.s390x.xml                     |  2 +-
 .../caps_2.11.0.x86_64.xml                    |  2 +-
 .../caps_2.12.0.ppc64.xml                     |  2 +-
 .../caps_2.12.0.s390x.xml                     |  2 +-
 .../caps_2.12.0.x86_64.xml                    |  2 +-
 .../caps_2.4.0.x86_64.xml                     |  2 +-
 .../caps_2.5.0.x86_64.xml                     |  2 +-
 .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml |  2 +-
 .../caps_2.6.0.x86_64.xml                     |  2 +-
 .../qemucapabilitiesdata/caps_2.7.0.s390x.xml |  2 +-
 .../caps_2.7.0.x86_64.xml                     |  2 +-
 .../qemucapabilitiesdata/caps_2.8.0.s390x.xml |  2 +-
 .../caps_2.8.0.x86_64.xml                     |  2 +-
 .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml |  2 +-
 .../qemucapabilitiesdata/caps_2.9.0.s390x.xml |  2 +-
 .../caps_2.9.0.x86_64.xml                     |  2 +-
 .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml |  2 +-
 .../caps_3.0.0.x86_64.xml                     |  2 +-
 38 files changed, 116 insertions(+), 109 deletions(-)
 delete mode 100644 tests/qemuargv2xmldata/nomachine-aarch64.args
 delete mode 100644 tests/qemuargv2xmldata/nomachine-aarch64.xml

-- 
2.17.1

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list