[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH-for-4.2 v7 05/10] hw/arm/virt: Add 4.2 machine type
From: |
Shameer Kolothum |
Subject: |
[Qemu-arm] [PATCH-for-4.2 v7 05/10] hw/arm/virt: Add 4.2 machine type |
Date: |
Tue, 16 Jul 2019 16:38:11 +0100 |
This is in preparation to create ACPI GED device as we
need to disable it for <4.2 for migration to work.
Signed-off-by: Shameer Kolothum <address@hidden>
---
hw/arm/virt.c | 9 ++++++++-
hw/core/machine.c | 3 +++
include/hw/boards.h | 3 +++
3 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 907fb64bb9..bbe156dc35 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -2095,10 +2095,17 @@ static void machvirt_machine_init(void)
}
type_init(machvirt_machine_init);
+static void virt_machine_4_2_options(MachineClass *mc)
+{
+}
+DEFINE_VIRT_MACHINE_AS_LATEST(4, 2)
+
static void virt_machine_4_1_options(MachineClass *mc)
{
+ virt_machine_4_2_options(mc);
+ compat_props_add(mc->compat_props, hw_compat_4_1, hw_compat_4_1_len);
}
-DEFINE_VIRT_MACHINE_AS_LATEST(4, 1)
+DEFINE_VIRT_MACHINE(4, 1)
static void virt_machine_4_0_options(MachineClass *mc)
{
diff --git a/hw/core/machine.c b/hw/core/machine.c
index c58a8e594e..a79d4ad740 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -27,6 +27,9 @@
#include "hw/pci/pci.h"
#include "hw/mem/nvdimm.h"
+GlobalProperty hw_compat_4_1[] = {};
+const size_t hw_compat_4_1_len = G_N_ELEMENTS(hw_compat_4_1);
+
GlobalProperty hw_compat_4_0[] = {
{ "VGA", "edid", "false" },
{ "secondary-vga", "edid", "false" },
diff --git a/include/hw/boards.h b/include/hw/boards.h
index a71d1a53a5..d9ec37d807 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -317,6 +317,9 @@ struct MachineState {
} \
type_init(machine_initfn##_register_types)
+extern GlobalProperty hw_compat_4_1[];
+extern const size_t hw_compat_4_1_len;
+
extern GlobalProperty hw_compat_4_0[];
extern const size_t hw_compat_4_0_len;
--
2.17.1
- [Qemu-arm] [PATCH-for-4.2 v7 00/10] ARM virt: ACPI memory hotplug support, Shameer Kolothum, 2019/07/16
- [Qemu-arm] [PATCH-for-4.2 v7 02/10] hw/acpi: Do not create memory hotplug method when handler is not defined, Shameer Kolothum, 2019/07/16
- [Qemu-arm] [PATCH-for-4.2 v7 05/10] hw/arm/virt: Add 4.2 machine type,
Shameer Kolothum <=
- [Qemu-arm] [PATCH-for-4.2 v7 04/10] hw/arm/virt: Add memory hotplug framework, Shameer Kolothum, 2019/07/16
- [Qemu-arm] [PATCH-for-4.2 v7 01/10] hw/acpi: Make ACPI IO address space configurable, Shameer Kolothum, 2019/07/16
- [Qemu-arm] [PATCH-for-4.2 v7 06/10] hw/arm/virt: Enable device memory cold/hot plug with ACPI boot, Shameer Kolothum, 2019/07/16
- [Qemu-arm] [PATCH-for-4.2 v7 03/10] hw/acpi: Add ACPI Generic Event Device Support, Shameer Kolothum, 2019/07/16