diff options
| author | Eduardo Habkost <ehabkost@redhat.com> | 2016-01-23 14:02:11 -0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2016-02-25 13:14:19 +0200 |
| commit | 18d6abae3ea092950629e5d26aff1dcfc9a2d78e (patch) | |
| tree | c86903d71db12e658b4fbccb2f6d2012afa8e594 /hw | |
| parent | d6b304ba924b95d12edfddaac99777b577301309 (diff) | |
| download | qemu-18d6abae3ea092950629e5d26aff1dcfc9a2d78e.zip qemu-18d6abae3ea092950629e5d26aff1dcfc9a2d78e.tar.gz qemu-18d6abae3ea092950629e5d26aff1dcfc9a2d78e.tar.bz2 | |
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>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/acpi/ich9.c | 8 | ||||
| -rw-r--r-- | hw/i386/pc_q35.c | 2 | ||||
| -rw-r--r-- | hw/isa/lpc_ich9.c | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c index 4f9ce05..7220254 100644 --- a/hw/acpi/ich9.c +++ b/hw/acpi/ich9.c @@ -240,7 +240,7 @@ static void pm_powerdown_req(Notifier *n, void *opaque) } void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, - bool smm_enabled, bool enable_tco, + bool smm_enabled, qemu_irq sci_irq) { 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->enable_tco = enable_tco; - if (pm->enable_tco) { - acpi_pm_tco_init(&pm->tco_regs, &pm->io); - } + pm->enable_tco = true; + acpi_pm_tco_init(&pm->tco_regs, &pm->io); pm->irq = sci_irq; qemu_register_reset(pm_reset, pm); diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c index 3ba0c38..06a5f95 100644 --- a/hw/i386/pc_q35.c +++ b/hw/i386/pc_q35.c @@ -225,7 +225,7 @@ static void pc_q35_init(MachineState *machine) (pcms->vmport != ON_OFF_AUTO_ON), 0xff0104); /* 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 = pci_create_simple_multifunction(host_bus, diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c index 6cf2eb6..4e896b2 100644 --- a/hw/isa/lpc_ich9.c +++ b/hw/isa/lpc_ich9.c @@ -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); qemu_irq sci_irq; 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); } |