summaryrefslogtreecommitdiffstats
path: root/hw/arm
diff options
context:
space:
mode:
authorCornelia Huck2020-11-09 18:39:28 +0100
committerMichael S. Tsirkin2020-12-08 19:48:58 +0100
commit576a00bdeb5bf93275e1d8e923d71daa80935f21 (patch)
tree83af9cdd9f20fd3f6895e44aa0ebbc524acd0b39 /hw/arm
parentfailover: Remove primary_dev member (diff)
downloadqemu-576a00bdeb5bf93275e1d8e923d71daa80935f21.tar.gz
qemu-576a00bdeb5bf93275e1d8e923d71daa80935f21.tar.xz
qemu-576a00bdeb5bf93275e1d8e923d71daa80935f21.zip
hw: add compat machines for 6.0
Add 6.0 machine types for arm/i440fx/q35/s390x/spapr. Signed-off-by: Cornelia Huck <cohuck@redhat.com> Message-Id: <20201109173928.1001764-1-cohuck@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@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 847257aa5c..22572c32b7 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -2590,10 +2590,17 @@ static void machvirt_machine_init(void)
}
type_init(machvirt_machine_init);
+static void virt_machine_6_0_options(MachineClass *mc)
+{
+}
+DEFINE_VIRT_MACHINE_AS_LATEST(6, 0)
+
static void virt_machine_5_2_options(MachineClass *mc)
{
+ virt_machine_6_0_options(mc);
+ compat_props_add(mc->compat_props, hw_compat_5_2, hw_compat_5_2_len);
}
-DEFINE_VIRT_MACHINE_AS_LATEST(5, 2)
+DEFINE_VIRT_MACHINE(5, 2)
static void virt_machine_5_1_options(MachineClass *mc)
{