Move psci_enable member from VirtMachineState to ArmMachineState.
Move claim_edge_triggered_timers member from VirtMachineClass to
ArmMachineClass.
Cc: Michael S. Tsirkin <m...@redhat.com>
Cc: Igor Mammedov <imamm...@redhat.com>
Cc: Shannon Zhao <shannon.zha...@gmail.com>
Signed-off-by: Xu Yandong <xuyando...@huawei.com>
---
hw/arm/virt-acpi-build.c | 7 ++++---
hw/arm/virt.c | 14 +++++++-------
include/hw/arm/arm.h | 2 ++
include/hw/arm/virt.h | 2 --
4 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 770c53f5d0..f2de897694 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -570,12 +570,12 @@ build_srat(GArray *table_data, BIOSLinker *linker,
VirtMachineState *vms)
static void
build_gtdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
{
- VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms);
+ ArmMachineClass *amc = ARM_MACHINE_GET_CLASS(ARM_MACHINE(vms));
int gtdt_start = table_data->len;
AcpiGenericTimerTable *gtdt;
uint32_t irqflags;
- if (vmc->claim_edge_triggered_timers) {
+ if (amc->claim_edge_triggered_timers) {
irqflags = ACPI_GTDT_INTERRUPT_MODE_EDGE;
} else {
irqflags = ACPI_GTDT_INTERRUPT_MODE_LEVEL;
@@ -696,6 +696,7 @@ build_madt(GArray *table_data, BIOSLinker *linker,
VirtMachineState *vms)
static void build_fadt_rev5(GArray *table_data, BIOSLinker *linker,
VirtMachineState *vms, unsigned dsdt_tbl_offset)
{
+ ArmMachineState *ams = ARM_MACHINE(vms);
/* ACPI v5.1 */
AcpiFadtData fadt = {
.rev = 5,
@@ -704,7 +705,7 @@ static void build_fadt_rev5(GArray *table_data, BIOSLinker
*linker,
.xdsdt_tbl_offset = &dsdt_tbl_offset,
};
- switch (vms->psci_conduit) {
+ switch (ams->psci_conduit) {
case QEMU_PSCI_CONDUIT_DISABLED:
fadt.arm_boot_arch = 0;
break;
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index f971f49bcf..2c0dfb2695 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -1576,11 +1576,11 @@ static void machvirt_init(MachineState *machine)
* because if we're using KVM then we must use HVC).
*/
if (vms->secure && firmware_loaded) {
- vms->psci_conduit = QEMU_PSCI_CONDUIT_DISABLED;
+ ams->psci_conduit = QEMU_PSCI_CONDUIT_DISABLED;
} else if (vms->virt) {
- vms->psci_conduit = QEMU_PSCI_CONDUIT_SMC;
+ ams->psci_conduit = QEMU_PSCI_CONDUIT_SMC;
} else {
- vms->psci_conduit = QEMU_PSCI_CONDUIT_HVC;
+ ams->psci_conduit = QEMU_PSCI_CONDUIT_HVC;
}
/* The maximum number of CPUs depends on the GIC version, or on how
@@ -1641,8 +1641,8 @@ static void machvirt_init(MachineState *machine)
object_property_set_bool(cpuobj, false, "has_el2", NULL);
}
- if (vms->psci_conduit != QEMU_PSCI_CONDUIT_DISABLED) {
- object_property_set_int(cpuobj, vms->psci_conduit,
+ if (ams->psci_conduit != QEMU_PSCI_CONDUIT_DISABLED) {
+ object_property_set_int(cpuobj, ams->psci_conduit,
"psci-conduit", NULL);
/* Secondary CPUs start in PSCI powered-down state */
@@ -2186,14 +2186,14 @@ DEFINE_VIRT_MACHINE(2, 9)
static void virt_machine_2_8_options(MachineClass *mc)
{
- VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
+ ArmMachineClass *amc = ARM_MACHINE_CLASS(OBJECT_CLASS(mc));
virt_machine_2_9_options(mc);
compat_props_add(mc->compat_props, hw_compat_2_8, hw_compat_2_8_len);
/* For 2.8 and earlier we falsely claimed in the DT that
* our timers were edge-triggered, not level-triggered.
*/
- vmc->claim_edge_triggered_timers = true;
+ amc->claim_edge_triggered_timers = true;
}
DEFINE_VIRT_MACHINE(2, 8)
diff --git a/include/hw/arm/arm.h b/include/hw/arm/arm.h
index 9ba51c4882..bb3680e583 100644
--- a/include/hw/arm/arm.h
+++ b/include/hw/arm/arm.h
@@ -86,6 +86,7 @@ typedef struct MemMapEntry {
typedef struct {
MachineClass parent;
+ bool claim_edge_triggered_timers;
} ArmMachineClass;
typedef struct {
@@ -97,6 +98,7 @@ typedef struct {
void *fdt;
int fdt_size;
uint32_t gic_phandle;
+ int psci_conduit;
DeviceState *gic;
} ArmMachineState;
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
index 393afb7faf..ad94634038 100644
--- a/include/hw/arm/virt.h
+++ b/include/hw/arm/virt.h
@@ -50,7 +50,6 @@ typedef struct {
bool disallow_affinity_adjustment;
bool no_its;
bool no_pmu;
- bool claim_edge_triggered_timers;
bool smbios_old_sys_ver;
bool no_highmem_ecam;
bool no_ged; /* Machines < 4.2 has no support for ACPI GED device */
@@ -73,7 +72,6 @@ typedef struct {
uint32_t clock_phandle;
uint32_t msi_phandle;
uint32_t iommu_phandle;
- int psci_conduit;
hwaddr highest_gpa;
DeviceState *acpi_dev;
Notifier powerdown_notifier;
--
2.18.1
