diff options
| author | Gerd Hoffmann | 2020-09-15 14:09:02 +0200 |
|---|---|---|
| committer | Gerd Hoffmann | 2020-09-17 14:16:19 +0200 |
| commit | 50aef1318166c2a5551d43fb99c5a517f54fcf3c (patch) | |
| tree | 6973a710f7858d63cc3bf2ce4d6863191a16dbf9 /include/hw/i386 | |
| parent | x86: constify x86_machine_is_*_enabled (diff) | |
| download | qemu-50aef1318166c2a5551d43fb99c5a517f54fcf3c.tar.gz qemu-50aef1318166c2a5551d43fb99c5a517f54fcf3c.tar.xz qemu-50aef1318166c2a5551d43fb99c5a517f54fcf3c.zip | |
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 'include/hw/i386')
| -rw-r--r-- | include/hw/i386/microvm.h | 1 | ||||
| -rw-r--r-- | include/hw/i386/pc.h | 1 | ||||
| -rw-r--r-- | include/hw/i386/x86.h | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/include/hw/i386/microvm.h b/include/hw/i386/microvm.h index d75dcf8203..be2d95af4d 100644 --- a/include/hw/i386/microvm.h +++ b/include/hw/i386/microvm.h @@ -68,7 +68,6 @@ struct MicrovmMachineState { bool kernel_cmdline_fixed; Notifier machine_done; Notifier powerdown_req; - AcpiDeviceIf *acpi_dev; }; typedef struct MicrovmMachineState MicrovmMachineState; diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 421a77acc2..c14e14dfe0 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -30,7 +30,6 @@ struct PCMachineState { Notifier machine_done; /* Pointers to devices and objects: */ - HotplugHandler *acpi_dev; PCIBus *bus; I2CBus *smbus; PFlashCFI01 *flash[2]; diff --git a/include/hw/i386/x86.h b/include/hw/i386/x86.h index 25c904638c..f540e801a8 100644 --- a/include/hw/i386/x86.h +++ b/include/hw/i386/x86.h @@ -52,6 +52,7 @@ struct X86MachineState { FWCfgState *fw_cfg; qemu_irq *gsi; GMappedFile *initrd_mapped_file; + HotplugHandler *acpi_dev; /* RAM information (sizes, addresses, configuration): */ ram_addr_t below_4g_mem_size, above_4g_mem_size; |