vl: Parse legacy default_machine_opts

qemu can't start a xen vm after commit d8fb7d0969
"vl: switch -M parsing to keyval" with:

$ ./qemu-system-i386 -M xenfv
Unexpected error in object_property_find_err() at ../qom/object.c:1298:
qemu-system-i386: Property 'xenfv-3.1-machine.accel' not found
Aborted (core dumped)

The default_machine_opts handling doesn't process the legacy machine
options like "accel".  Call qemu_apply_legacy_machine_options to provide
the legacy handling.

Signed-off-by: Jason Andryuk <jandryuk@gmail.com>
Message-Id: <20210713021552.19110-1-jandryuk@gmail.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
stable-6.1
Jason Andryuk 2021-07-12 22:15:52 -04:00 committed by Paolo Bonzini
parent 461fea9bf1
commit dadafe6785
1 changed files with 1 additions and 0 deletions

View File

@ -2126,6 +2126,7 @@ static void qemu_create_machine(QDict *qdict)
QDict *default_opts =
keyval_parse(machine_class->default_machine_opts, NULL, NULL,
&error_abort);
qemu_apply_legacy_machine_options(default_opts);
object_set_properties_from_keyval(OBJECT(current_machine), default_opts,
false, &error_abort);
qobject_unref(default_opts);