Revision | c52e7bbbaf77ed240b3f5fb7aab5615cf3db98dc (tree) |
---|---|
Time | 2020-07-07 00:01:11 |
Author | Gerd Hoffmann <kraxel@redh...> |
Commiter | Gerd Hoffmann |
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
@@ -1160,7 +1160,6 @@ void pc_basic_device_init(struct PCMachineState *pcms, | ||
1160 | 1160 | ISADevice **rtc_state, |
1161 | 1161 | bool create_fdctrl, |
1162 | 1162 | bool no_vmport, |
1163 | - bool has_pit, | |
1164 | 1163 | uint32_t hpet_irqs) |
1165 | 1164 | { |
1166 | 1165 | int i; |
@@ -1211,7 +1210,7 @@ void pc_basic_device_init(struct PCMachineState *pcms, | ||
1211 | 1210 | |
1212 | 1211 | qemu_register_boot_set(pc_boot_set, *rtc_state); |
1213 | 1212 | |
1214 | - if (!xen_enabled() && has_pit) { | |
1213 | + if (!xen_enabled() && pcms->pit_enabled) { | |
1215 | 1214 | if (kvm_pit_in_kernel()) { |
1216 | 1215 | pit = kvm_pit_init(isa_bus, 0x40); |
1217 | 1216 | } else { |
@@ -236,7 +236,7 @@ static void pc_init1(MachineState *machine, | ||
236 | 236 | |
237 | 237 | /* init basic PC hardware */ |
238 | 238 | pc_basic_device_init(pcms, isa_bus, x86ms->gsi, &rtc_state, true, |
239 | - (pcms->vmport != ON_OFF_AUTO_ON), pcms->pit_enabled, | |
239 | + (pcms->vmport != ON_OFF_AUTO_ON), | |
240 | 240 | 0x4); |
241 | 241 | |
242 | 242 | pc_nic_init(pcmc, isa_bus, pci_bus); |
@@ -276,7 +276,7 @@ static void pc_q35_init(MachineState *machine) | ||
276 | 276 | |
277 | 277 | /* init basic PC hardware */ |
278 | 278 | pc_basic_device_init(pcms, isa_bus, x86ms->gsi, &rtc_state, !mc->no_floppy, |
279 | - (pcms->vmport != ON_OFF_AUTO_ON), pcms->pit_enabled, | |
279 | + (pcms->vmport != ON_OFF_AUTO_ON), | |
280 | 280 | 0xff0104); |
281 | 281 | |
282 | 282 | /* connect pm stuff to lpc */ |
@@ -165,7 +165,6 @@ void pc_basic_device_init(struct PCMachineState *pcms, | ||
165 | 165 | ISADevice **rtc_state, |
166 | 166 | bool create_fdctrl, |
167 | 167 | bool no_vmport, |
168 | - bool has_pit, | |
169 | 168 | uint32_t hpet_irqs); |
170 | 169 | void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd); |
171 | 170 | void pc_cmos_init(PCMachineState *pcms, |