Commit e29f2379 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Philippe Mathieu-Daudé
Browse files

hw/isa/piix4: Move piix4_create() to hw/isa/piix4.c 



Now that we properly refactored the piix4_create() function, let's
move it to hw/isa/piix4.c where it belongs, so it can be reused
on other places.

Reviewed-by: default avatarAleksandar Markovic <amarkovic@wavecomp.com>
Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
parent c74d2c04

hw/isa/piix4.c

+30 −0
Original line number Diff line number Diff line
@@ -27,12 +27,14 @@ 
#include "qapi/error.h"

#include "hw/irq.h"

#include "hw/i386/pc.h"

#include "hw/southbridge/piix.h"

#include "hw/pci/pci.h"

#include "hw/isa/isa.h"

#include "hw/sysbus.h"

#include "hw/dma/i8257.h"

#include "hw/timer/i8254.h"

#include "hw/rtc/mc146818rtc.h"

#include "hw/ide.h"

#include "migration/vmstate.h"

#include "sysemu/reset.h"

#include "sysemu/runstate.h"
@@ -237,3 +239,31 @@ static void piix4_register_types(void) 
}



type_init(piix4_register_types)



DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus,

                          I2CBus **smbus, size_t ide_buses)

{

    size_t ide_drives = ide_buses * MAX_IDE_DEVS;

    DriveInfo **hd;

    PCIDevice *pci;

    DeviceState *dev;



    pci = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0),

                                          true, TYPE_PIIX4_PCI_DEVICE);

    dev = DEVICE(pci);

    if (isa_bus) {

        *isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0"));

    }



    hd = g_new(DriveInfo *, ide_drives);

    ide_drive_get(hd, ide_drives);

    pci_piix4_ide_init(pci_bus, hd, pci->devfn + 1);

    g_free(hd);

    pci_create_simple(pci_bus, pci->devfn + 2, "piix4-usb-uhci");

    if (smbus) {

        *smbus = piix4_pm_init(pci_bus, pci->devfn + 3, 0x1100,

                               isa_get_irq(NULL, 9), NULL, 0, NULL);

   }



    return dev;

}

hw/mips/gt64xxx_pci.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include "hw/mips/mips.h"

#include "hw/pci/pci.h"

#include "hw/pci/pci_host.h"

#include "hw/southbridge/piix.h"

#include "migration/vmstate.h"

#include "hw/i386/pc.h"

#include "hw/irq.h"

hw/mips/mips_malta.c

+0 −28
Original line number Diff line number Diff line
@@ -1210,34 +1210,6 @@ static void mips_create_cpu(MachineState *ms, MaltaState *s, 
    }

}



static DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus,

                                 I2CBus **smbus, size_t ide_buses)

{

    const size_t ide_drives = ide_buses * MAX_IDE_DEVS;

    DriveInfo **hd;

    PCIDevice *pci;

    DeviceState *dev;



    pci = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0),

                                          true, TYPE_PIIX4_PCI_DEVICE);

    dev = DEVICE(pci);

    if (isa_bus) {

        *isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0"));

    }



    hd = g_new(DriveInfo *, ide_drives);

    ide_drive_get(hd, ide_drives);

    pci_piix4_ide_init(pci_bus, hd, pci->devfn + 1);

    g_free(hd);

    pci_create_simple(pci_bus, pci->devfn + 2, "piix4-usb-uhci");

    if (smbus) {

        *smbus = piix4_pm_init(pci_bus, pci->devfn + 3, 0x1100,

                               isa_get_irq(NULL, 9), NULL, 0, NULL);

   }



    return dev;

}



static

void mips_malta_init(MachineState *machine)

{

include/hw/i386/pc.h

+0 −2
Original line number Diff line number Diff line
@@ -258,8 +258,6 @@ PCIBus *i440fx_init(const char *host_type, const char *pci_type, 
                    MemoryRegion *ram_memory);



PCIBus *find_i440fx(void);

/* piix4.c */

extern PCIDevice *piix4_dev;



/* pc_sysfw.c */

void pc_system_flash_create(PCMachineState *pcms);

include/hw/southbridge/piix.h

+6 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
 * QEMU PIIX South Bridge Emulation

 *

 * Copyright (c) 2006 Fabrice Bellard

 * Copyright (c) 2018 Hervé Poussineau

 *

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.
@@ -17,4 +18,9 @@ I2CBus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base, 
                      qemu_irq sci_irq, qemu_irq smi_irq,

                      int smm_enabled, DeviceState **piix4_pm);



extern PCIDevice *piix4_dev;



DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus,

                          I2CBus **smbus, size_t ide_buses);



#endif