]> git.ipfire.org Git - thirdparty/libvirt.git/commit
qemu: Don't crash when parsing command line lacking -M
authorAndrea Bolognani <abologna@redhat.com>
Tue, 10 Oct 2017 13:53:53 +0000 (15:53 +0200)
committerAndrea Bolognani <abologna@redhat.com>
Wed, 11 Oct 2017 06:44:31 +0000 (08:44 +0200)
commit0e0e328dc1acc6a871910d17446013140a966080
tree98b1e8a1339a10e23f8b323b3dba1efef8df2697
parent20e3217a54fa8fa25a3420ec8cfaeed343739f6f
qemu: Don't crash when parsing command line lacking -M

Parse the -M (or -machine) command line option before starting
processing in earnest and have a fallback ready in case it's not
present, so that while parsing other options we can rely on
def->os.machine being initialized.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1379218

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
src/qemu/qemu_parse_command.c
tests/qemuargv2xmldata/qemuargv2xml-nomachine-aarch64.args [new file with mode: 0644]
tests/qemuargv2xmldata/qemuargv2xml-nomachine-aarch64.xml [new file with mode: 0644]
tests/qemuargv2xmldata/qemuargv2xml-nomachine-ppc64.args [new file with mode: 0644]
tests/qemuargv2xmldata/qemuargv2xml-nomachine-ppc64.xml [new file with mode: 0644]
tests/qemuargv2xmldata/qemuargv2xml-nomachine-x86_64.args [new file with mode: 0644]
tests/qemuargv2xmldata/qemuargv2xml-nomachine-x86_64.xml [new file with mode: 0644]
tests/qemuargv2xmltest.c