Commit 10e2483b authored Jul 02, 2020 by Gerd Hoffmann

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

parent fcb541c1

hw/i386/pc.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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,

hw/i386/pc_piix.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

hw/i386/pc_q35.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

include/hw/i386/pc.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -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,