diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2021-11-09 13:16:55 +0100 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2021-11-09 13:16:56 +0100 |
| commit | 2b22e7540d6ab4efe82d442363e3fc900cea6584 (patch) | |
| tree | 7abb34c5065608457c8ea58dac7cc6d346f5b98d /hw/m68k | |
| parent | 21cc2bda7fda39ba749da607d6db50f55354f1fb (diff) | |
| parent | 6ed25621f2890d8f1c3b9e6f7a0e91c841aea1f8 (diff) | |
| download | qemu-2b22e7540d6ab4efe82d442363e3fc900cea6584.zip qemu-2b22e7540d6ab4efe82d442363e3fc900cea6584.tar.gz qemu-2b22e7540d6ab4efe82d442363e3fc900cea6584.tar.bz2 | |
Merge tag 'm68k-for-6.2-pull-request' of git://github.com/vivier/qemu-m68k into staging
m68k pull request 20211109
Add virt machine types for 6.1 and 6.2
# gpg: Signature made Tue 09 Nov 2021 12:14:39 PM CET
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
* tag 'm68k-for-6.2-pull-request' of git://github.com/vivier/qemu-m68k:
hw: m68k: virt: Add compat machine for 6.2
hw: m68k: virt: Add compat machine for 6.1
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'hw/m68k')
| -rw-r--r-- | hw/m68k/virt.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c index edc58fb..0efa4a4 100644 --- a/hw/m68k/virt.c +++ b/hw/m68k/virt.c @@ -304,7 +304,21 @@ type_init(virt_machine_register_types) } \ type_init(machvirt_machine_##major##_##minor##_init); +static void virt_machine_6_2_options(MachineClass *mc) +{ +} +DEFINE_VIRT_MACHINE(6, 2, true) + +static void virt_machine_6_1_options(MachineClass *mc) +{ + virt_machine_6_2_options(mc); + compat_props_add(mc->compat_props, hw_compat_6_1, hw_compat_6_1_len); +} +DEFINE_VIRT_MACHINE(6, 1, false) + static void virt_machine_6_0_options(MachineClass *mc) { + virt_machine_6_1_options(mc); + compat_props_add(mc->compat_props, hw_compat_6_0, hw_compat_6_0_len); } -DEFINE_VIRT_MACHINE(6, 0, true) +DEFINE_VIRT_MACHINE(6, 0, false) |