summaryrefslogtreecommitdiffstats
path: root/hw/arm
diff options
context:
space:
mode:
authorCornelia Huck2019-04-11 12:20:25 +0200
committerEduardo Habkost2019-04-25 19:16:41 +0200
commit9bf2650bc3aab126b85c034bf86e27d564f9a1aa (patch)
treeb568f44d8a58fead6c820e83a0bb69d1ae81cc8d /hw/arm
parentMerge remote-tracking branch 'remotes/lersek/tags/edk2-pull-2019-04-22' into ... (diff)
downloadqemu-9bf2650bc3aab126b85c034bf86e27d564f9a1aa.tar.gz
qemu-9bf2650bc3aab126b85c034bf86e27d564f9a1aa.tar.xz
qemu-9bf2650bc3aab126b85c034bf86e27d564f9a1aa.zip
hw: add compat machines for 4.1
Add 4.1 machine types for arm/i440fx/q35/s390x/spapr. Signed-off-by: Cornelia Huck <cohuck@redhat.com> Message-Id: <20190411102025.22559-1-cohuck@redhat.com> Acked-by: Greg Kurz <groug@kaod.org> Acked-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'hw/arm')
-rw-r--r--hw/arm/virt.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index ce2664a30b..16ba67f7a7 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1978,10 +1978,17 @@ static void machvirt_machine_init(void)
}
type_init(machvirt_machine_init);
+static void virt_machine_4_1_options(MachineClass *mc)
+{
+}
+DEFINE_VIRT_MACHINE_AS_LATEST(4, 1)
+
static void virt_machine_4_0_options(MachineClass *mc)
{
+ virt_machine_4_1_options(mc);
+ compat_props_add(mc->compat_props, hw_compat_4_0, hw_compat_4_0_len);
}
-DEFINE_VIRT_MACHINE_AS_LATEST(4, 0)
+DEFINE_VIRT_MACHINE(4, 0)
static void virt_machine_3_1_options(MachineClass *mc)
{