Skip to content

Commit

Permalink
vl: process -object after other backend options
Browse files Browse the repository at this point in the history
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>
(cherry picked from commit 7b71758)
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
  • Loading branch information
bonzini authored and mdroth committed Sep 10, 2014
1 parent 0824ca6 commit 3d8cc86
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions vl.c
Expand Up @@ -4009,11 +4009,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()
Expand Down Expand Up @@ -4225,6 +4220,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) {
Expand Down

0 comments on commit 3d8cc86

Please sign in to comment.