[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 14/19] pc_basic_device_init: drop has_pit arg
From: |
Gerd Hoffmann |
Subject: |
[PATCH v3 14/19] pc_basic_device_init: drop has_pit arg |
Date: |
Mon, 22 Jun 2020 13:29:09 +0200 |
Now that we pass pcms anyway, we don't need the has_pit arg any more.
No functional change.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
include/hw/i386/pc.h | 1 -
hw/i386/pc.c | 3 +--
hw/i386/pc_piix.c | 2 +-
hw/i386/pc_q35.c | 2 +-
4 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 9b94926410c0..3512dcfd3d27 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -165,7 +165,6 @@ void pc_basic_device_init(struct PCMachineState *pcms,
ISADevice **rtc_state,
bool create_fdctrl,
bool no_vmport,
- bool has_pit,
uint32_t hpet_irqs);
void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd);
void pc_cmos_init(PCMachineState *pcms,
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 9afb003dfc21..dfe8ba07e982 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1181,7 +1181,6 @@ void pc_basic_device_init(struct PCMachineState *pcms,
ISADevice **rtc_state,
bool create_fdctrl,
bool no_vmport,
- bool has_pit,
uint32_t hpet_irqs)
{
int i;
@@ -1232,7 +1231,7 @@ void pc_basic_device_init(struct PCMachineState *pcms,
qemu_register_boot_set(pc_boot_set, *rtc_state);
- if (!xen_enabled() && has_pit) {
+ if (!xen_enabled() && pcms->pit_enabled) {
if (kvm_pit_in_kernel()) {
pit = kvm_pit_init(isa_bus, 0x40);
} else {
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index 605252fe7936..1242ed811804 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -236,7 +236,7 @@ static void pc_init1(MachineState *machine,
/* init basic PC hardware */
pc_basic_device_init(pcms, isa_bus, x86ms->gsi, &rtc_state, true,
- (pcms->vmport != ON_OFF_AUTO_ON), pcms->pit_enabled,
+ (pcms->vmport != ON_OFF_AUTO_ON),
0x4);
pc_nic_init(pcmc, isa_bus, pci_bus);
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index e4b15f27227a..25dc40896673 100644
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -276,7 +276,7 @@ static void pc_q35_init(MachineState *machine)
/* init basic PC hardware */
pc_basic_device_init(pcms, isa_bus, x86ms->gsi, &rtc_state, !mc->no_floppy,
- (pcms->vmport != ON_OFF_AUTO_ON), pcms->pit_enabled,
+ (pcms->vmport != ON_OFF_AUTO_ON),
0xff0104);
/* connect pm stuff to lpc */
--
2.18.4
- [PATCH v3 00/19] audio: deprecate -soundhw, Gerd Hoffmann, 2020/06/22
- [PATCH v3 01/19] stubs: add isa_create_simple, Gerd Hoffmann, 2020/06/22
- [PATCH v3 04/19] audio: deprecate -soundhw ac97, Gerd Hoffmann, 2020/06/22
- [PATCH v3 10/19] audio: deprecate -soundhw hda, Gerd Hoffmann, 2020/06/22
- [PATCH v3 03/19] audio: add deprecated_register_soundhw, Gerd Hoffmann, 2020/06/22
- [PATCH v3 02/19] stubs: add pci_create_simple, Gerd Hoffmann, 2020/06/22
- [PATCH v3 16/19] softmmu: initialize spice and audio earlier, Gerd Hoffmann, 2020/06/22
- [PATCH v3 15/19] pc_basic_device_init: drop no_vmport arg, Gerd Hoffmann, 2020/06/22
- [PATCH v3 14/19] pc_basic_device_init: drop has_pit arg,
Gerd Hoffmann <=
- [PATCH v3 11/19] audio: deprecate -soundhw pcspk, Gerd Hoffmann, 2020/06/22
- Re: [PATCH v3 11/19] audio: deprecate -soundhw pcspk, Gerd Hoffmann, 2020/06/22
[PATCH v3 12/19] audio: add soundhw deprecation notice, Gerd Hoffmann, 2020/06/22