diff options
| author | Philippe Mathieu-Daudé <philmd@redhat.com> | 2019-10-15 07:00:41 +0200 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <philmd@redhat.com> | 2019-11-05 23:33:12 +0100 |
| commit | 48bc99a09cb160a3a2612c4bd5a8a225ed7bf6fb (patch) | |
| tree | 64006bfb083624e012afe6c3a891ec2f32b28c43 /hw/i386 | |
| parent | 0f25d865a1764527546cf159883e880d487363cf (diff) | |
| download | qemu-48bc99a09cb160a3a2612c4bd5a8a225ed7bf6fb.zip qemu-48bc99a09cb160a3a2612c4bd5a8a225ed7bf6fb.tar.gz qemu-48bc99a09cb160a3a2612c4bd5a8a225ed7bf6fb.tar.bz2 | |
hw/pci-host/i440fx: Remove the last PIIX3 traces
The PIIX3 is not tied to the i440FX and can even be used without it.
Move its creation to the machine code (pc_piix.c).
We have now removed the last trace of southbridge code in the i440FX
northbridge.
Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Diffstat (limited to 'hw/i386')
| -rw-r--r-- | hw/i386/pc_piix.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index ba35d56..2aefa3b 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -192,14 +192,20 @@ static void pc_init1(MachineState *machine, gsi_state = pc_gsi_create(&x86ms->gsi, pcmc->pci_enabled); if (pcmc->pci_enabled) { + PIIX3State *piix3; + pci_bus = i440fx_init(host_type, pci_type, - &i440fx_state, &piix3_devfn, &isa_bus, x86ms->gsi, + &i440fx_state, system_memory, system_io, machine->ram_size, x86ms->below_4g_mem_size, x86ms->above_4g_mem_size, pci_memory, ram_memory); pcms->bus = pci_bus; + + piix3 = piix3_create(pci_bus, &isa_bus); + piix3->pic = x86ms->gsi; + piix3_devfn = piix3->dev.devfn; } else { pci_bus = NULL; i440fx_state = NULL; |