[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v3 19/21] ich9: Remove enable_tco arguments from init
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v3 19/21] ich9: Remove enable_tco arguments from init functions |
Date: |
Thu, 25 Feb 2016 13:21:29 +0200 |
From: Eduardo Habkost <address@hidden>
The enable_tco arguments are always true, so they are not needed
anymore.
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
---
include/hw/acpi/ich9.h | 1 -
include/hw/i386/ich9.h | 2 +-
hw/acpi/ich9.c | 8 +++-----
hw/i386/pc_q35.c | 2 +-
hw/isa/lpc_ich9.c | 4 ++--
5 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h
index 345fd8d..63fa198 100644
--- a/include/hw/acpi/ich9.h
+++ b/include/hw/acpi/ich9.h
@@ -62,7 +62,6 @@ typedef struct ICH9LPCPMRegs {
void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm,
bool smm_enabled,
- bool enable_tco,
qemu_irq sci_irq);
void ich9_pm_iospace_update(ICH9LPCPMRegs *pm, uint32_t pm_io_base);
diff --git a/include/hw/i386/ich9.h b/include/hw/i386/ich9.h
index b9d2b04..b411434 100644
--- a/include/hw/i386/ich9.h
+++ b/include/hw/i386/ich9.h
@@ -17,7 +17,7 @@
void ich9_lpc_set_irq(void *opaque, int irq_num, int level);
int ich9_lpc_map_irq(PCIDevice *pci_dev, int intx);
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);
void ich9_generate_smi(void);
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);
}
--
MST
- [Qemu-devel] [PULL v3 11/21] virtio: export vring_notify as virtio_should_notify, (continued)
- [Qemu-devel] [PULL v3 11/21] virtio: export vring_notify as virtio_should_notify, Michael S. Tsirkin, 2016/02/25
- [Qemu-devel] [PULL v3 09/21] vring: make vring_enable_notification return void, Michael S. Tsirkin, 2016/02/25
- [Qemu-devel] [PULL v3 08/21] block-migration: acquire AioContext as necessary, Michael S. Tsirkin, 2016/02/25
- [Qemu-devel] [PULL v3 12/21] virtio-blk: fix "disabled data plane" mode, Michael S. Tsirkin, 2016/02/25
- [Qemu-devel] [PULL v3 14/21] virtio-scsi: do not use vring in dataplane, Michael S. Tsirkin, 2016/02/25
- [Qemu-devel] [PULL v3 13/21] virtio-blk: do not use vring in dataplane, Michael S. Tsirkin, 2016/02/25
- [Qemu-devel] [PULL v3 15/21] vring: remove, Michael S. Tsirkin, 2016/02/25
- [Qemu-devel] [PULL v3 16/21] tests/vhost-user-bridge: fix build on 32 bit systems, Michael S. Tsirkin, 2016/02/25
- [Qemu-devel] [PULL v3 17/21] q35: Remove old machine versions, Michael S. Tsirkin, 2016/02/25
- [Qemu-devel] [PULL v3 18/21] machine: Remove no_tco field, Michael S. Tsirkin, 2016/02/25
- [Qemu-devel] [PULL v3 19/21] ich9: Remove enable_tco arguments from init functions,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v3 20/21] q35: Remove unused q35-acpi-dsdt.aml file, Michael S. Tsirkin, 2016/02/25
- [Qemu-devel] [PULL v3 21/21] q35: No need to check gigabyte_align, Michael S. Tsirkin, 2016/02/25
- Re: [Qemu-devel] [PULL v3 00/21] vhost, virtio, pci, pc, Peter Maydell, 2016/02/25