• R/O
  • HTTP
  • SSH
  • HTTPS

qemu: Commit


Commit MetaInfo

Revisionc52e7bbbaf77ed240b3f5fb7aab5615cf3db98dc (tree)
Time2020-07-07 00:01:11
AuthorGerd Hoffmann <kraxel@redh...>
CommiterGerd Hoffmann

Log Message

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

Change Summary

Incremental Difference

--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1160,7 +1160,6 @@ void pc_basic_device_init(struct PCMachineState *pcms,
11601160 ISADevice **rtc_state,
11611161 bool create_fdctrl,
11621162 bool no_vmport,
1163- bool has_pit,
11641163 uint32_t hpet_irqs)
11651164 {
11661165 int i;
@@ -1211,7 +1210,7 @@ void pc_basic_device_init(struct PCMachineState *pcms,
12111210
12121211 qemu_register_boot_set(pc_boot_set, *rtc_state);
12131212
1214- if (!xen_enabled() && has_pit) {
1213+ if (!xen_enabled() && pcms->pit_enabled) {
12151214 if (kvm_pit_in_kernel()) {
12161215 pit = kvm_pit_init(isa_bus, 0x40);
12171216 } else {
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -236,7 +236,7 @@ static void pc_init1(MachineState *machine,
236236
237237 /* init basic PC hardware */
238238 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),
240240 0x4);
241241
242242 pc_nic_init(pcmc, isa_bus, pci_bus);
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -276,7 +276,7 @@ static void pc_q35_init(MachineState *machine)
276276
277277 /* init basic PC hardware */
278278 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),
280280 0xff0104);
281281
282282 /* connect pm stuff to lpc */
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -165,7 +165,6 @@ void pc_basic_device_init(struct PCMachineState *pcms,
165165 ISADevice **rtc_state,
166166 bool create_fdctrl,
167167 bool no_vmport,
168- bool has_pit,
169168 uint32_t hpet_irqs);
170169 void pc_init_ne2k_isa(ISABus *bus, NICInfo *nd);
171170 void pc_cmos_init(PCMachineState *pcms,
Show on old repository browser