Commit 48bc99a0 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé
Browse files

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: default avatarAleksandar Markovic <amarkovic@wavecomp.com>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
parent 0f25d865

hw/i386/pc_piix.c

+7 −1
Original line number Diff line number Diff line
@@ -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;

hw/pci-host/i440fx.c

+0 −8
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include "hw/pci/pci.h"

#include "hw/pci/pci_host.h"

#include "hw/pci-host/i440fx.h"

#include "hw/southbridge/piix.h"

#include "hw/qdev-properties.h"

#include "hw/sysbus.h"

#include "qapi/error.h"
@@ -272,8 +271,6 @@ static void i440fx_realize(PCIDevice *dev, Error **errp) 


PCIBus *i440fx_init(const char *host_type, const char *pci_type,

                    PCII440FXState **pi440fx_state,

                    int *piix3_devfn,

                    ISABus **isa_bus, qemu_irq *pic,

                    MemoryRegion *address_space_mem,

                    MemoryRegion *address_space_io,

                    ram_addr_t ram_size,
@@ -286,7 +283,6 @@ PCIBus *i440fx_init(const char *host_type, const char *pci_type, 
    PCIBus *b;

    PCIDevice *d;

    PCIHostState *s;

    PIIX3State *piix3;

    PCII440FXState *f;

    unsigned i;

    I440FXState *i440fx;
@@ -339,10 +335,6 @@ PCIBus *i440fx_init(const char *host_type, const char *pci_type, 
                 PAM_EXPAN_SIZE);

    }



    piix3 = piix3_create(b, isa_bus);

    piix3->pic = pic;

    *piix3_devfn = piix3->dev.devfn;



    ram_size = ram_size / 8 / 1024 / 1024;

    if (ram_size > 255) {

        ram_size = 255;

include/hw/pci-host/i440fx.h

+1 −2
Original line number Diff line number Diff line
@@ -22,8 +22,7 @@ typedef struct PCII440FXState PCII440FXState; 
#define TYPE_IGD_PASSTHROUGH_I440FX_PCI_DEVICE "igd-passthrough-i440FX"



PCIBus *i440fx_init(const char *host_type, const char *pci_type,

                    PCII440FXState **pi440fx_state, int *piix_devfn,

                    ISABus **isa_bus, qemu_irq *pic,

                    PCII440FXState **pi440fx_state,

                    MemoryRegion *address_space_mem,

                    MemoryRegion *address_space_io,

                    ram_addr_t ram_size,