aboutsummaryrefslogtreecommitdiff
path: root/vl.c
diff options
context:
space:
mode:
authorEduardo Habkost <ehabkost@redhat.com>2016-06-15 15:54:52 -0300
committerEduardo Habkost <ehabkost@redhat.com>2016-07-07 15:24:50 -0300
commit8d76bfe8f8dbc7995bc0682d14f5f92583ae5b0a (patch)
tree148ee95efbcc36ead063036b7a23e75d4fe0cbde /vl.c
parent823efc5d26671e4737b2951d65b0565806ee43ab (diff)
downloadqemu-arm-8d76bfe8f8dbc7995bc0682d14f5f92583ae5b0a.tar.gz
qdev: Eliminate qemu_add_globals() function
The function is just a helper to handle the -global options, it can stay in vl.c like most qemu_opts_foreach() calls. Reviewed-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'vl.c')
-rw-r--r--vl.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/vl.c b/vl.c
index 5cd0f2a7db..ebdeaa0b9d 100644
--- a/vl.c
+++ b/vl.c
@@ -2913,6 +2913,19 @@ static void set_memory_options(uint64_t *ram_slots, ram_addr_t *maxram_size,
loc_pop(&loc);
}
+static int global_init_func(void *opaque, QemuOpts *opts, Error **errp)
+{
+ GlobalProperty *g;
+
+ g = g_malloc0(sizeof(*g));
+ g->driver = qemu_opt_get(opts, "driver");
+ g->property = qemu_opt_get(opts, "property");
+ g->value = qemu_opt_get(opts, "value");
+ g->user_provided = true;
+ qdev_prop_register_global(g);
+ return 0;
+}
+
int main(int argc, char **argv, char **envp)
{
int i;
@@ -4442,7 +4455,8 @@ int main(int argc, char **argv, char **envp)
qdev_prop_register_global(p);
}
}
- qemu_add_globals();
+ qemu_opts_foreach(qemu_find_opts("global"),
+ global_init_func, NULL, NULL);
/* This checkpoint is required by replay to separate prior clock
reading from the other reads, because timer polling functions query