path: root/vl.c
diff options
authorIgor Mammedov <imammedo@redhat.com>2016-01-28 11:58:08 +0100
committerEduardo Habkost <ehabkost@redhat.com>2016-05-20 14:28:54 -0300
commitbacc344c548ce165a0001276ece56ee4b0bddae3 (patch)
treedf773e89863c26316b09afaf5cb214543108194d /vl.c
parent16714b16806979d7f9f245b2b4c13966e4fa1c2e (diff)
machine: add properties to compat_props incrementaly
Switch to adding compat properties incrementaly instead of completly overwriting compat_props per machine type. That removes data duplication which we have due to nested [PC|SPAPR]_COMPAT_* macros. It also allows to set default device properties from default foo_machine_options() hook, which will be used in following patch for putting VMGENID device as a function if ISA bridge on pc/q35 machines. Suggested-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Igor Mammedov <imammedo@redhat.com> Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> [ehabkost: Fixed CCW_COMPAT_* and PC_COMPAT_0_* defines] Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'vl.c')
1 files changed, 5 insertions, 1 deletions
diff --git a/vl.c b/vl.c
index 88618624f8..0228843822 100644
--- a/vl.c
+++ b/vl.c
@@ -4473,7 +4473,11 @@ int main(int argc, char **argv, char **envp)
if (machine_class->compat_props) {
- qdev_prop_register_global_list(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);
+ }