diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2014-08-25 13:47:00 +0200 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-08-26 13:44:39 +0200 |
commit | 7b71758d79106a63a0b8aba02df752d9995ea50c (patch) | |
tree | 03775f8442e5b5b2e04649c0f56ca044083f6503 /vl.c | |
parent | a6859deb6908261c9a9adf9cc4b8863fc0897b5c (diff) | |
download | qemu-7b71758d79106a63a0b8aba02df752d9995ea50c.zip qemu-7b71758d79106a63a0b8aba02df752d9995ea50c.tar.gz qemu-7b71758d79106a63a0b8aba02df752d9995ea50c.tar.bz2 |
vl: process -object after other backend options
QOM backends can refer to chardevs, but not vice versa. So
process -chardev and -fsdev options before -object
This fixes the rng-egd backend to virtio-rng.
Reported-by: Amos Kong <akong@redhat.com>
Cc: qemu-stable@nongnu.org
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'vl.c')
-rw-r--r-- | vl.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -4033,11 +4033,6 @@ int main(int argc, char **argv, char **envp) qemu_set_version(machine_class->hw_version); } - if (qemu_opts_foreach(qemu_find_opts("object"), - object_create, NULL, 0) != 0) { - exit(1); - } - /* Init CPU def lists, based on config * - Must be called after all the qemu_read_config_file() calls * - Must be called before list_cpus() @@ -4249,6 +4244,11 @@ int main(int argc, char **argv, char **envp) exit(0); } + if (qemu_opts_foreach(qemu_find_opts("object"), + object_create, NULL, 0) != 0) { + exit(1); + } + machine_opts = qemu_get_machine_opts(); if (qemu_opt_foreach(machine_opts, object_set_property, current_machine, 1) < 0) { |