aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Andryuk <jandryuk@gmail.com>2021-07-12 22:15:52 -0400
committerPaolo Bonzini <pbonzini@redhat.com>2021-07-20 17:06:28 +0200
commitdadafe6785ada3ec4a2d11410c691458b3c2b39f (patch)
tree09fb257fb4636f67d2e51010ac4175a010ff2cb1
parent461fea9bf1db0e122cfc18ea07958ddebea5d9a3 (diff)
downloadqemu-dadafe6785ada3ec4a2d11410c691458b3c2b39f.zip
qemu-dadafe6785ada3ec4a2d11410c691458b3c2b39f.tar.gz
qemu-dadafe6785ada3ec4a2d11410c691458b3c2b39f.tar.bz2
vl: Parse legacy default_machine_opts
qemu can't start a xen vm after commit d8fb7d0969d5 "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>
-rw-r--r--softmmu/vl.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 4df1496..f4d8630 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -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);