summaryrefslogtreecommitdiff
path: root/hw/arm
diff options
context:
space:
mode:
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 /hw/arm
parent16714b16806979d7f9f245b2b4c13966e4fa1c2e (diff)
downloadqemu-bacc344c548ce165a0001276ece56ee4b0bddae3.tar.gz
qemu-bacc344c548ce165a0001276ece56ee4b0bddae3.tar.bz2
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/arm')
-rw-r--r--hw/arm/virt.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index fe6b11d24e..e77ed88afb 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1418,13 +1418,9 @@ static void virt_2_6_instance_init(Object *obj)
static void virt_2_6_class_init(ObjectClass *oc, void *data)
{
MachineClass *mc = MACHINE_CLASS(oc);
- static GlobalProperty compat_props[] = {
- { /* end of list */ }
- };
mc->desc = "QEMU 2.6 ARM Virtual Machine";
mc->alias = "virt";
- mc->compat_props = compat_props;
}
static const TypeInfo machvirt_info = {