diff options
| author | Igor Mammedov <imammedo@redhat.com> | 2016-01-28 11:58:08 +0100 |
|---|---|---|
| committer | Eduardo Habkost <ehabkost@redhat.com> | 2016-05-20 14:28:54 -0300 |
| commit | bacc344c548ce165a0001276ece56ee4b0bddae3 (patch) | |
| tree | df773e89863c26316b09afaf5cb214543108194d /hw/core/machine.c | |
| parent | 16714b16806979d7f9f245b2b4c13966e4fa1c2e (diff) | |
| download | focaccia-qemu-bacc344c548ce165a0001276ece56ee4b0bddae3.tar.gz focaccia-qemu-bacc344c548ce165a0001276ece56ee4b0bddae3.zip | |
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 'hw/core/machine.c')
| -rw-r--r-- | hw/core/machine.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/hw/core/machine.c b/hw/core/machine.c index 0bb96ad457..ccdd5fa3e7 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -571,6 +571,15 @@ bool machine_mem_merge(MachineState *machine) return machine->mem_merge; } +static void machine_class_finalize(ObjectClass *klass, void *data) +{ + MachineClass *mc = MACHINE_CLASS(klass); + + if (mc->compat_props) { + g_array_free(mc->compat_props, true); + } +} + static const TypeInfo machine_info = { .name = TYPE_MACHINE, .parent = TYPE_OBJECT, @@ -578,6 +587,7 @@ static const TypeInfo machine_info = { .class_size = sizeof(MachineClass), .class_init = machine_class_init, .class_base_init = machine_class_base_init, + .class_finalize = machine_class_finalize, .instance_size = sizeof(MachineState), .instance_init = machine_initfn, .instance_finalize = machine_finalize, |