pc_basic_device_init: drop has_pit arg
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> Message-id: 20200702132525.6849-13-kraxel@redhat.com
This commit is contained in:
parent
10e2483b5f
commit
c52e7bbbaf
@ -1160,7 +1160,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;
|
||||
@ -1211,7 +1210,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 {
|
||||
|
@ -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);
|
||||
|
@ -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 */
|
||||
|
@ -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,
|
||||
|
Loading…
Reference in New Issue
Block a user