• R/O
  • HTTP
  • SSH
  • HTTPS

qemu: Commit


Commit MetaInfo

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

Log Message

pc_basic_device_init: pass PCMachineState

Need access to pcms for pcspk initialization.
Just preparation, no functional change.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20200702132525.6849-12-kraxel@redhat.com

Change Summary

Incremental Difference

--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1155,7 +1155,8 @@ static void pc_superio_init(ISABus *isa_bus, bool create_fdctrl, bool no_vmport)
11551155 g_free(a20_line);
11561156 }
11571157
1158-void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
1158+void pc_basic_device_init(struct PCMachineState *pcms,
1159+ ISABus *isa_bus, qemu_irq *gsi,
11591160 ISADevice **rtc_state,
11601161 bool create_fdctrl,
11611162 bool no_vmport,
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -235,7 +235,7 @@ static void pc_init1(MachineState *machine,
235235 }
236236
237237 /* init basic PC hardware */
238- pc_basic_device_init(isa_bus, x86ms->gsi, &rtc_state, true,
238+ pc_basic_device_init(pcms, isa_bus, x86ms->gsi, &rtc_state, true,
239239 (pcms->vmport != ON_OFF_AUTO_ON), pcms->pit_enabled,
240240 0x4);
241241
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -275,7 +275,7 @@ static void pc_q35_init(MachineState *machine)
275275 }
276276
277277 /* init basic PC hardware */
278- pc_basic_device_init(isa_bus, x86ms->gsi, &rtc_state, !mc->no_floppy,
278+ pc_basic_device_init(pcms, isa_bus, x86ms->gsi, &rtc_state, !mc->no_floppy,
279279 (pcms->vmport != ON_OFF_AUTO_ON), pcms->pit_enabled,
280280 0xff0104);
281281
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -160,7 +160,8 @@ void pc_memory_init(PCMachineState *pcms,
160160 MemoryRegion **ram_memory);
161161 uint64_t pc_pci_hole64_start(void);
162162 DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus);
163-void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
163+void pc_basic_device_init(struct PCMachineState *pcms,
164+ ISABus *isa_bus, qemu_irq *gsi,
164165 ISADevice **rtc_state,
165166 bool create_fdctrl,
166167 bool no_vmport,
Show on old repository browser