diff options
| author | Cornelia Huck <cohuck@redhat.com> | 2019-11-12 11:48:11 +0100 |
|---|---|---|
| committer | Cornelia Huck <cohuck@redhat.com> | 2019-12-14 10:25:50 +0100 |
| commit | 3eb74d2087d3bd6cb51c06a49ba94222248d2de4 (patch) | |
| tree | c5f5949e647c59f53a9e0966f0e22f184a1f7b90 /hw/i386/pc_q35.c | |
| parent | 91f751dc111b270b1e81d80ac92cf479e7620fa4 (diff) | |
| download | focaccia-qemu-3eb74d2087d3bd6cb51c06a49ba94222248d2de4.tar.gz focaccia-qemu-3eb74d2087d3bd6cb51c06a49ba94222248d2de4.zip | |
hw: add compat machines for 5.0
Add 5.0 machine types for arm/i440fx/q35/s390x/spapr. For i440fx and q35, unversioned cpu models are still translated to -v1; I'll leave changing this (if desired) to the respective maintainers. Signed-off-by: Cornelia Huck <cohuck@redhat.com> Message-Id: <20191112104811.30323-1-cohuck@redhat.com> Acked-by: David Gibson <david@gibson.dropbear.id.au> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Diffstat (limited to 'hw/i386/pc_q35.c')
| -rw-r--r-- | hw/i386/pc_q35.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 2608cd0062..7398d7baa2 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -348,7 +348,7 @@ static void pc_q35_machine_options(MachineClass *m) m->max_cpus = 288; } -static void pc_q35_4_2_machine_options(MachineClass *m) +static void pc_q35_5_0_machine_options(MachineClass *m) { PCMachineClass *pcmc = PC_MACHINE_CLASS(m); pc_q35_machine_options(m); @@ -357,6 +357,17 @@ static void pc_q35_4_2_machine_options(MachineClass *m) compat_props_add(m->compat_props, hw_compat_4_2, hw_compat_4_2_len); } +DEFINE_Q35_MACHINE(v5_0, "pc-q35-5.0", NULL, + pc_q35_5_0_machine_options); + +static void pc_q35_4_2_machine_options(MachineClass *m) +{ + pc_q35_5_0_machine_options(m); + m->alias = NULL; + compat_props_add(m->compat_props, hw_compat_4_2, hw_compat_4_2_len); + compat_props_add(m->compat_props, pc_compat_4_2, pc_compat_4_2_len); +} + DEFINE_Q35_MACHINE(v4_2, "pc-q35-4.2", NULL, pc_q35_4_2_machine_options); |