diff options
| author | Laszlo Ersek | 2015-04-29 15:20:16 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin | 2015-06-04 11:25:42 +0200 |
| commit | 6e7d82497dc8da7d420c8fa6632d759e08a18bc3 (patch) | |
| tree | 98a26e456da9cebfc13a17be4602f7520f511e34 /include | |
| parent | hw/acpi: move "etc/system-states" fw_cfg file from PIIX4 to core (diff) | |
| download | qemu-6e7d82497dc8da7d420c8fa6632d759e08a18bc3.tar.gz qemu-6e7d82497dc8da7d420c8fa6632d759e08a18bc3.tar.xz qemu-6e7d82497dc8da7d420c8fa6632d759e08a18bc3.zip | |
hw/acpi: piix4_pm_init(): take fw_cfg object no more
This PIIX4 init function has no more reason to receive a pointer to the
FwCfg object. Remove the parameter from the prototype, and update callers.
As a result, the pc_init1() function no longer needs to save the return
value of pc_memory_init() and xen_load_linux(), which makes it more
similar to pc_q35_init().
The return type & value of pc_memory_init() and xen_load_linux() are not
changed themselves; maybe we'll need their return values sometime later.
RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1204696
Cc: Amit Shah <amit.shah@redhat.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Leon Alrae <leon.alrae@imgtec.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/i386/pc.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 27bd748eab..0d501c9368 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -218,8 +218,7 @@ void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name); I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, qemu_irq sci_irq, qemu_irq smi_irq, - int kvm_enabled, FWCfgState *fw_cfg, - DeviceState **piix4_pm); + int kvm_enabled, DeviceState **piix4_pm); void piix4_smbus_register_device(SMBusDevice *dev, uint8_t addr); /* hpet.c */ |