diff options
| author | Gerd Hoffmann <kraxel@redhat.com> | 2020-09-15 14:09:02 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2020-09-17 14:16:19 +0200 |
| commit | 50aef1318166c2a5551d43fb99c5a517f54fcf3c (patch) | |
| tree | 6973a710f7858d63cc3bf2ce4d6863191a16dbf9 /hw/i386/acpi-microvm.c | |
| parent | 9927a6329a4ce832b4b529903b0a1e1f580cbf0f (diff) | |
| download | qemu-50aef1318166c2a5551d43fb99c5a517f54fcf3c.zip qemu-50aef1318166c2a5551d43fb99c5a517f54fcf3c.tar.gz qemu-50aef1318166c2a5551d43fb99c5a517f54fcf3c.tar.bz2 | |
x86: move acpi_dev from pc/microvm
Both pc and microvm machine types have a acpi_dev field.
Move it to the common base type.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Sergio Lopez <slp@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-id: 20200915120909.20838-15-kraxel@redhat.com
Diffstat (limited to 'hw/i386/acpi-microvm.c')
| -rw-r--r-- | hw/i386/acpi-microvm.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/i386/acpi-microvm.c b/hw/i386/acpi-microvm.c index b9ce376..df39c5d 100644 --- a/hw/i386/acpi-microvm.c +++ b/hw/i386/acpi-microvm.c @@ -108,7 +108,7 @@ build_dsdt_microvm(GArray *table_data, BIOSLinker *linker, sb_scope = aml_scope("_SB"); fw_cfg_add_acpi_dsdt(sb_scope, x86ms->fw_cfg); isa_build_aml(ISA_BUS(isabus), sb_scope); - build_ged_aml(sb_scope, GED_DEVICE, HOTPLUG_HANDLER(mms->acpi_dev), + build_ged_aml(sb_scope, GED_DEVICE, x86ms->acpi_dev, GED_MMIO_IRQ, AML_SYSTEM_MEMORY, GED_MMIO_BASE); acpi_dsdt_add_power_button(sb_scope); acpi_dsdt_add_virtio(sb_scope, mms); @@ -136,6 +136,7 @@ static void acpi_build_microvm(AcpiBuildTables *tables, MicrovmMachineState *mms) { MachineState *machine = MACHINE(mms); + X86MachineState *x86ms = X86_MACHINE(mms); GArray *table_offsets; GArray *tables_blob = tables->table_data; unsigned dsdt, xsdt; @@ -183,7 +184,7 @@ static void acpi_build_microvm(AcpiBuildTables *tables, acpi_add_table(table_offsets, tables_blob); acpi_build_madt(tables_blob, tables->linker, X86_MACHINE(machine), - mms->acpi_dev, false); + ACPI_DEVICE_IF(x86ms->acpi_dev), false); xsdt = tables_blob->len; build_xsdt(tables_blob, tables->linker, table_offsets, NULL, NULL); |