openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Gerd Hoffmann 2020-07-02 15:25:16 +02:00
parent fcb541c14e
commit 10e2483b5f
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/i386/pc.c
View File

@ -1155,7 +1155,8 @@ static void pc_superio_init(ISABus *isa_bus, bool create_fdctrl, bool no_vmport)
g_free(a20_line); 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, ISADevice **rtc_state,
bool create_fdctrl, bool create_fdctrl,
bool no_vmport, bool no_vmport,

2
hw/i386/pc_piix.c
View File

@ -235,7 +235,7 @@ static void pc_init1(MachineState *machine,
} }
/* init basic PC hardware */ /* 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, (pcms->vmport != ON_OFF_AUTO_ON), pcms->pit_enabled,
0x4); 0x4);

2
hw/i386/pc_q35.c
View File

@ -275,7 +275,7 @@ static void pc_q35_init(MachineState *machine)
} }
/* init basic PC hardware */ /* 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, (pcms->vmport != ON_OFF_AUTO_ON), pcms->pit_enabled,
0xff0104); 0xff0104);

3
include/hw/i386/pc.h
View File

@ -160,7 +160,8 @@ void pc_memory_init(PCMachineState *pcms,
MemoryRegion **ram_memory); MemoryRegion **ram_memory);
uint64_t pc_pci_hole64_start(void); uint64_t pc_pci_hole64_start(void);
DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus); 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, ISADevice **rtc_state,
bool create_fdctrl, bool create_fdctrl,
bool no_vmport, bool no_vmport,