From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51021) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLFSe-0004DV-Md for qemu-devel@nongnu.org; Thu, 07 Jul 2016 15:59:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bLFSc-0004Ij-O3 for qemu-devel@nongnu.org; Thu, 07 Jul 2016 15:59:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36561) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bLFSc-0004Ic-IE for qemu-devel@nongnu.org; Thu, 07 Jul 2016 15:59:46 -0400 From: Eduardo Habkost Date: Thu, 7 Jul 2016 16:59:10 -0300 Message-Id: <1467921562-11796-5-git-send-email-ehabkost@redhat.com> In-Reply-To: <1467921562-11796-1-git-send-email-ehabkost@redhat.com> References: <1467921562-11796-1-git-send-email-ehabkost@redhat.com> Subject: [Qemu-devel] [PULL 04/16] machine: Add machine_register_compat_props() function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell Cc: Paolo Bonzini , Richard Henderson , qemu-devel@nongnu.org Move the compat_props handling to core machine code. Reviewed-by: Marcel Apfelbaum Reviewed-by: Markus Armbruster Signed-off-by: Eduardo Habkost --- hw/core/machine.c | 16 ++++++++++++++++ include/hw/boards.h | 1 + vl.c | 9 ++------- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/hw/core/machine.c b/hw/core/machine.c index 8f94301..052517d 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -560,6 +560,22 @@ static void machine_class_finalize(ObjectClass *klass, void *data) } } +void machine_register_compat_props(MachineState *machine) +{ + MachineClass *mc = MACHINE_GET_CLASS(machine); + int i; + GlobalProperty *p; + + if (!mc->compat_props) { + return; + } + + for (i = 0; i < mc->compat_props->len; i++) { + p = g_array_index(mc->compat_props, GlobalProperty *, i); + qdev_prop_register_global(p); + } +} + static const TypeInfo machine_info = { .name = TYPE_MACHINE, .parent = TYPE_OBJECT, diff --git a/include/hw/boards.h b/include/hw/boards.h index 3ed6155..3e69eca 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -40,6 +40,7 @@ int machine_kvm_shadow_mem(MachineState *machine); int machine_phandle_start(MachineState *machine); bool machine_dump_guest_core(MachineState *machine); bool machine_mem_merge(MachineState *machine); +void machine_register_compat_props(MachineState *machine); /** * CPUArchId: diff --git a/vl.c b/vl.c index ebdeaa0..356713e 100644 --- a/vl.c +++ b/vl.c @@ -4448,13 +4448,8 @@ int main(int argc, char **argv, char **envp) exit (i == 1 ? 1 : 0); } - if (machine_class->compat_props) { - GlobalProperty *p; - for (i = 0; i < machine_class->compat_props->len; i++) { - p = g_array_index(machine_class->compat_props, GlobalProperty *, i); - qdev_prop_register_global(p); - } - } + machine_register_compat_props(current_machine); + qemu_opts_foreach(qemu_find_opts("global"), global_init_func, NULL, NULL); -- 2.5.5