[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/14] vl: clean up global property registration
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 03/14] vl: clean up global property registration |
Date: |
Wed, 28 Jun 2017 13:30:55 +0200 |
From: Peter Xu <address@hidden>
It's not that clear on how the global properties are registered to
global_props (and also its priority relationship). Let's provide a
single function to be called in main() for that, with comment to explain
it a bit.
Signed-off-by: Peter Xu <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
vl.c | 29 ++++++++++++++++++++++++-----
1 file changed, 24 insertions(+), 5 deletions(-)
diff --git a/vl.c b/vl.c
index 4452d7a..c0cdb17 100644
--- a/vl.c
+++ b/vl.c
@@ -2969,6 +2969,25 @@ static int qemu_read_default_config_file(void)
return 0;
}
+static void user_register_global_props(void)
+{
+ qemu_opts_foreach(qemu_find_opts("global"),
+ global_init_func, NULL, NULL);
+}
+
+/*
+ * Note: we should see that these properties are actually having a
+ * priority: accel < machine < user. This means e.g. when user
+ * specifies something in "-global", it'll always be used with highest
+ * priority than either machine/accelerator compat properties.
+ */
+static void register_global_properties(MachineState *ms)
+{
+ accel_register_compat_props(ms->accelerator);
+ machine_register_compat_props(ms);
+ user_register_global_props();
+}
+
int main(int argc, char **argv, char **envp)
{
int i;
@@ -4571,11 +4590,11 @@ int main(int argc, char **argv, char **envp)
exit (i == 1 ? 1 : 0);
}
- accel_register_compat_props(current_machine->accelerator);
- machine_register_compat_props(current_machine);
-
- qemu_opts_foreach(qemu_find_opts("global"),
- global_init_func, NULL, NULL);
+ /*
+ * Register all the global properties, including accel properties,
+ * machine properties, and user-specified ones.
+ */
+ register_global_properties(current_machine);
/* This checkpoint is required by replay to separate prior clock
reading from the other reads, because timer polling functions query
--
2.9.4
- [Qemu-devel] [PULL 00/14] Migration pull request for 20170628, Juan Quintela, 2017/06/28
- [Qemu-devel] [PULL 01/14] machine: export register_compat_prop(), Juan Quintela, 2017/06/28
- [Qemu-devel] [PULL 03/14] vl: clean up global property registration,
Juan Quintela <=
- [Qemu-devel] [PULL 02/14] accel: introduce AccelClass.global_props, Juan Quintela, 2017/06/28
- [Qemu-devel] [PULL 04/14] migration: let MigrationState be a qdev, Juan Quintela, 2017/06/28
- [Qemu-devel] [PULL 07/14] migration: move skip_configuration out, Juan Quintela, 2017/06/28
- [Qemu-devel] [PULL 05/14] migration: move global_state.optional out, Juan Quintela, 2017/06/28
- [Qemu-devel] [PULL 08/14] migration: move skip_section_footers, Juan Quintela, 2017/06/28
- [Qemu-devel] [PULL 09/14] migration: merge enforce_config_section somewhat, Juan Quintela, 2017/06/28
- [Qemu-devel] [PULL 06/14] migration: move only_migratable to MigrationState, Juan Quintela, 2017/06/28
- [Qemu-devel] [PULL 11/14] migration: add comment for TYPE_MIGRATE, Juan Quintela, 2017/06/28