[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/28] hw: virt: consider hw_compat_6_0
From: |
Peter Maydell |
Subject: |
[PULL 05/28] hw: virt: consider hw_compat_6_0 |
Date: |
Tue, 15 Jun 2021 16:43:42 +0100 |
From: Heinrich Schuchardt <xypron.glpk@gmx.de>
virt-6.0 must consider hw_compat_6_0.
Fixes: da7e13c00b59 ("hw: add compat machines for 6.1")
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Message-id: 20210610183500.54207-1-xypron.glpk@gmx.de
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/arm/virt.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 840758666d4..8bc3b408fe7 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -2764,6 +2764,8 @@ DEFINE_VIRT_MACHINE_AS_LATEST(6, 1)
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)
--
2.20.1
- [PULL 00/28] target-arm queue, Peter Maydell, 2021/06/15
- [PULL 01/28] hw/intc/arm_gicv3_cpuif: Tolerate spurious EOIR writes, Peter Maydell, 2021/06/15
- [PULL 02/28] target/arm: Diagnose UNALLOCATED in disas_simd_two_reg_misc_fp16, Peter Maydell, 2021/06/15
- [PULL 03/28] target/arm: Remove fprintf from disas_simd_mod_imm, Peter Maydell, 2021/06/15
- [PULL 04/28] target/arm: Diagnose UNALLOCATED in disas_simd_three_reg_same_fp16, Peter Maydell, 2021/06/15
- [PULL 05/28] hw: virt: consider hw_compat_6_0,
Peter Maydell <=
- [PULL 07/28] hw/arm: quanta-gbs-bmc add i2c comments, Peter Maydell, 2021/06/15
- [PULL 06/28] hw/arm: add quanta-gbs-bmc machine, Peter Maydell, 2021/06/15
- [PULL 08/28] hw/intc/armv7m_nvic: Remove stale comment, Peter Maydell, 2021/06/15
- [PULL 12/28] target/arm: Fix mte page crossing test, Peter Maydell, 2021/06/15
- [PULL 11/28] target/arm: Use acpi_ghes_present() to see if we report ACPI memory errors, Peter Maydell, 2021/06/15
- [PULL 13/28] hw/arm: gsj add i2c comments, Peter Maydell, 2021/06/15
- [PULL 09/28] hw/acpi: Provide stub version of acpi_ghes_record_errors(), Peter Maydell, 2021/06/15
- [PULL 14/28] hw/arm: gsj add pca9548, Peter Maydell, 2021/06/15
- [PULL 15/28] hw/arm: quanta-q71l add pca954x muxes, Peter Maydell, 2021/06/15
- [PULL 10/28] hw/acpi: Provide function acpi_ghes_present(), Peter Maydell, 2021/06/15