ich9: Remove enable_tco arguments from init functions
The enable_tco arguments are always true, so they are not needed anymore. Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
This commit is contained in:
parent
d6b304ba92
commit
18d6abae3e
|
@ -240,7 +240,7 @@ static void pm_powerdown_req(Notifier *n, void *opaque)
|
||||||
}
|
}
|
||||||
|
|
||||||
void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
|
void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
|
||||||
bool smm_enabled, bool enable_tco,
|
bool smm_enabled,
|
||||||
qemu_irq sci_irq)
|
qemu_irq sci_irq)
|
||||||
{
|
{
|
||||||
memory_region_init(&pm->io, OBJECT(lpc_pci), "ich9-pm", ICH9_PMIO_SIZE);
|
memory_region_init(&pm->io, OBJECT(lpc_pci), "ich9-pm", ICH9_PMIO_SIZE);
|
||||||
|
@ -264,10 +264,8 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
|
||||||
|
|
||||||
pm->smm_enabled = smm_enabled;
|
pm->smm_enabled = smm_enabled;
|
||||||
|
|
||||||
pm->enable_tco = enable_tco;
|
pm->enable_tco = true;
|
||||||
if (pm->enable_tco) {
|
|
||||||
acpi_pm_tco_init(&pm->tco_regs, &pm->io);
|
acpi_pm_tco_init(&pm->tco_regs, &pm->io);
|
||||||
}
|
|
||||||
|
|
||||||
pm->irq = sci_irq;
|
pm->irq = sci_irq;
|
||||||
qemu_register_reset(pm_reset, pm);
|
qemu_register_reset(pm_reset, pm);
|
||||||
|
|
|
@ -225,7 +225,7 @@ static void pc_q35_init(MachineState *machine)
|
||||||
(pcms->vmport != ON_OFF_AUTO_ON), 0xff0104);
|
(pcms->vmport != ON_OFF_AUTO_ON), 0xff0104);
|
||||||
|
|
||||||
/* connect pm stuff to lpc */
|
/* connect pm stuff to lpc */
|
||||||
ich9_lpc_pm_init(lpc, pc_machine_is_smm_enabled(pcms), true);
|
ich9_lpc_pm_init(lpc, pc_machine_is_smm_enabled(pcms));
|
||||||
|
|
||||||
/* ahci and SATA device, for q35 1 ahci controller is built-in */
|
/* ahci and SATA device, for q35 1 ahci controller is built-in */
|
||||||
ahci = pci_create_simple_multifunction(host_bus,
|
ahci = pci_create_simple_multifunction(host_bus,
|
||||||
|
|
|
@ -369,13 +369,13 @@ static void ich9_set_sci(void *opaque, int irq_num, int level)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ich9_lpc_pm_init(PCIDevice *lpc_pci, bool smm_enabled, bool enable_tco)
|
void ich9_lpc_pm_init(PCIDevice *lpc_pci, bool smm_enabled)
|
||||||
{
|
{
|
||||||
ICH9LPCState *lpc = ICH9_LPC_DEVICE(lpc_pci);
|
ICH9LPCState *lpc = ICH9_LPC_DEVICE(lpc_pci);
|
||||||
qemu_irq sci_irq;
|
qemu_irq sci_irq;
|
||||||
|
|
||||||
sci_irq = qemu_allocate_irq(ich9_set_sci, lpc, 0);
|
sci_irq = qemu_allocate_irq(ich9_set_sci, lpc, 0);
|
||||||
ich9_pm_init(lpc_pci, &lpc->pm, smm_enabled, enable_tco, sci_irq);
|
ich9_pm_init(lpc_pci, &lpc->pm, smm_enabled, sci_irq);
|
||||||
ich9_lpc_reset(&lpc->d.qdev);
|
ich9_lpc_reset(&lpc->d.qdev);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -62,7 +62,6 @@ typedef struct ICH9LPCPMRegs {
|
||||||
|
|
||||||
void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
|
void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
|
||||||
bool smm_enabled,
|
bool smm_enabled,
|
||||||
bool enable_tco,
|
|
||||||
qemu_irq sci_irq);
|
qemu_irq sci_irq);
|
||||||
|
|
||||||
void ich9_pm_iospace_update(ICH9LPCPMRegs *pm, uint32_t pm_io_base);
|
void ich9_pm_iospace_update(ICH9LPCPMRegs *pm, uint32_t pm_io_base);
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
void ich9_lpc_set_irq(void *opaque, int irq_num, int level);
|
void ich9_lpc_set_irq(void *opaque, int irq_num, int level);
|
||||||
int ich9_lpc_map_irq(PCIDevice *pci_dev, int intx);
|
int ich9_lpc_map_irq(PCIDevice *pci_dev, int intx);
|
||||||
PCIINTxRoute ich9_route_intx_pin_to_irq(void *opaque, int pirq_pin);
|
PCIINTxRoute ich9_route_intx_pin_to_irq(void *opaque, int pirq_pin);
|
||||||
void ich9_lpc_pm_init(PCIDevice *pci_lpc, bool smm_enabled, bool enable_tco);
|
void ich9_lpc_pm_init(PCIDevice *pci_lpc, bool smm_enabled);
|
||||||
I2CBus *ich9_smb_init(PCIBus *bus, int devfn, uint32_t smb_io_base);
|
I2CBus *ich9_smb_init(PCIBus *bus, int devfn, uint32_t smb_io_base);
|
||||||
|
|
||||||
void ich9_generate_smi(void);
|
void ich9_generate_smi(void);
|
||||||
|
|
Loading…
Reference in a new issue