pc_basic_device_init: pass PCMachineState

kraxel · kraxel · commit 10e2483b5f4f · 2020-07-06T17:01:11.000+02:00
Need access to pcms for pcspk initialization.
Just preparation, no functional change.

Signed-off-by: Gerd Hoffmann &lt;kraxel@redhat.com&gt;
Message-id: 20200702132525.6849-12-kraxel@redhat.com
diff --git 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)
     g_free(a20_line);
 }
 
-void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
+void pc_basic_device_init(struct PCMachineState *pcms,
+                          ISABus *isa_bus, qemu_irq *gsi,
                           ISADevice **rtc_state,
                           bool create_fdctrl,
                           bool no_vmport,
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
@@ -235,7 +235,7 @@ static void pc_init1(MachineState *machine,
     }
 
     /* init basic PC hardware */
-    pc_basic_device_init(isa_bus, x86ms->gsi, &rtc_state, true,
+    pc_basic_device_init(pcms, isa_bus, x86ms->gsi, &rtc_state, true,
                          (pcms->vmport != ON_OFF_AUTO_ON), pcms->pit_enabled,
                          0x4);
 
diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
@@ -275,7 +275,7 @@ static void pc_q35_init(MachineState *machine)
     }
 
     /* init basic PC hardware */
-    pc_basic_device_init(isa_bus, x86ms->gsi, &rtc_state, !mc->no_floppy,
+    pc_basic_device_init(pcms, isa_bus, x86ms->gsi, &rtc_state, !mc->no_floppy,
                          (pcms->vmport != ON_OFF_AUTO_ON), pcms->pit_enabled,
                          0xff0104);
 
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
@@ -160,7 +160,8 @@ void pc_memory_init(PCMachineState *pcms,
                     MemoryRegion **ram_memory);
 uint64_t pc_pci_hole64_start(void);
 DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus);
-void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
+void pc_basic_device_init(struct PCMachineState *pcms,
+                          ISABus *isa_bus, qemu_irq *gsi,
                           ISADevice **rtc_state,
                           bool create_fdctrl,
                           bool no_vmport,

Original file line number	Diff line number	Diff line change
`@@ -1155,7 +1155,8 @@ static void pc_superio_init(ISABus *isa_bus, bool create_fdctrl, bool no_vmport)`
`1155`	`1155`	`g_free(a20_line);`
`1156`	`1156`	`}`
`1157`	`1157`
`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,`
`1159`	`1160`	`ISADevice **rtc_state,`
`1160`	`1161`	`bool create_fdctrl,`
`1161`	`1162`	`bool no_vmport,`
Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ static void pc_init1(MachineState *machine,`
`235`	`235`	`}`
`236`	`236`
`237`	`237`	`/* 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,`
`239`	`239`	`(pcms->vmport != ON_OFF_AUTO_ON), pcms->pit_enabled,`
`240`	`240`	`0x4);`
`241`	`241`
Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ static void pc_q35_init(MachineState *machine)`
`275`	`275`	`}`
`276`	`276`
`277`	`277`	`/* 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,`
`279`	`279`	`(pcms->vmport != ON_OFF_AUTO_ON), pcms->pit_enabled,`
`280`	`280`	`0xff0104);`
`281`	`281`