]> xenbits.xensource.com Git - libvirt.git/commit
qemu: fix default machine for argv -> xml convertor
authorDaniel P. Berrangé <berrange@redhat.com>
Mon, 13 Aug 2018 11:42:01 +0000 (12:42 +0100)
committerDaniel P. Berrangé <berrange@redhat.com>
Tue, 28 Aug 2018 10:49:01 +0000 (11:49 +0100)
commit6700062fb00031c2c4fb8a561653a1a58246ba4b
treebd3a8eff05987f9d5cc7abc1e3c2eba4372fb593
parent81950efa0ba9d734ddcfbf71e95c0c7cd843ea8d
qemu: fix default machine for argv -> xml convertor

Historically the argv -> xml convertor wanted the same default machine
as we'd set when parsing xml. The latter has now changed, however, to
use a default defined by libvirt. The former needs fixing to again
honour the default QEMU machine.

This exposed a bug in handling for the aarch64 target, as QEMU does not
define any default machine. Thus we should not having been accepting
argv without a -machine provided.

Reviewed-by: John Ferlan <jferlan@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
12 files changed:
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.h
src/qemu/qemu_driver.c
src/qemu/qemu_parse_command.c
src/qemu/qemu_parse_command.h
tests/qemuargv2xmldata/nomachine-aarch64.args [deleted file]
tests/qemuargv2xmldata/nomachine-aarch64.xml [deleted file]
tests/qemuargv2xmldata/nomachine-ppc64.xml
tests/qemuargv2xmldata/nomachine-x86_64.xml
tests/qemuargv2xmldata/pseries-disk.xml
tests/qemuargv2xmldata/pseries-nvram.xml
tests/qemuargv2xmltest.c