motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 16:53:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

x86: move acpi_dev from pc/microvm

Browse source 
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
This commit is contained in:
Gerd Hoffmann 2020-09-15 14:09:02 +02:00
parent 9927a6329a
commit 50aef13181
9 changed files with 32 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/hw/i386/microvm.h
View file

@ -68,7 +68,6 @@ struct MicrovmMachineState {
bool kernel_cmdline_fixed;
Notifier machine_done;
Notifier powerdown_req;
AcpiDeviceIf *acpi_dev;
};
typedef struct MicrovmMachineState MicrovmMachineState;

1
include/hw/i386/pc.h
View file

@ -30,7 +30,6 @@ struct PCMachineState {
Notifier machine_done;
/* Pointers to devices and objects: */
HotplugHandler *acpi_dev;
PCIBus *bus;
I2CBus *smbus;
PFlashCFI01 *flash[2];

1
include/hw/i386/x86.h
View file

@ -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;