mirror of https://github.com/xemu-project/xemu.git
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>
This commit is contained in:
parent
a6859deb69
commit
7b71758d79
10
vl.c
10
vl.c
|
@ -4033,11 +4033,6 @@ int main(int argc, char **argv, char **envp)
|
||||||
qemu_set_version(machine_class->hw_version);
|
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
|
/* Init CPU def lists, based on config
|
||||||
* - Must be called after all the qemu_read_config_file() calls
|
* - Must be called after all the qemu_read_config_file() calls
|
||||||
* - Must be called before list_cpus()
|
* - Must be called before list_cpus()
|
||||||
|
@ -4249,6 +4244,11 @@ int main(int argc, char **argv, char **envp)
|
||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (qemu_opts_foreach(qemu_find_opts("object"),
|
||||||
|
object_create, NULL, 0) != 0) {
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
machine_opts = qemu_get_machine_opts();
|
machine_opts = qemu_get_machine_opts();
|
||||||
if (qemu_opt_foreach(machine_opts, object_set_property, current_machine,
|
if (qemu_opt_foreach(machine_opts, object_set_property, current_machine,
|
||||||
1) < 0) {
|
1) < 0) {
|
||||||
|
|
Loading…
Reference in New Issue