From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58540) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XN0Oc-0001In-C3 for qemu-devel@nongnu.org; Thu, 28 Aug 2014 10:09:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XN0OW-0001Bk-DK for qemu-devel@nongnu.org; Thu, 28 Aug 2014 10:09:50 -0400 Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 28 Aug 2014 16:09:10 +0200 Message-Id: <1409234953-20742-12-git-send-email-pbonzini@redhat.com> In-Reply-To: <1409234953-20742-1-git-send-email-pbonzini@redhat.com> References: <1409234953-20742-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 11/14] vl: process -object after other backend options List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org 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 Cc: qemu-stable@nongnu.org Signed-off-by: Paolo Bonzini --- vl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vl.c b/vl.c index b796c67..95be92d 100644 --- a/vl.c +++ b/vl.c @@ -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) { -- 1.8.3.1